Merge "Aapt2: Fix png leak" am: f62e38583a
am: 5d4c38c637

Change-Id: I0a14e885d6e2cf886b9e87f395ffa5a600ef7f28