Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Avoid a harmless potential integer overflow in png_XYZ_from_xy().

Change-Id: Ie98d8fc97398fe54fbfef5a2533a0e99007126ef