Merge "androidfw: Add tests for compact entries/short offsets"