Merge "Aapt2: Fix png leak" am: f62e38583a am: 5d4c38c637
am: caecc66ba0  -s ours

Change-Id: I91911edbd4b9203a11067bc678807b7ca46895a7