Merge "androidfw: Add support for 16-bit entry offsets"