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