Merge "androidfw: fix size verification for 16-bit entry offsets"