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

Change-Id: I8bff9b440b5a1f75d75e3601b654aa8825cf9523