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

Change-Id: I7cb92299774b11b46e6f150aefb2280b6ec375f0