Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
am: 2d885e942d

Change-Id: Ic1c24dd55a4d6258533e57cea957a775e03013df