Merge "Aapt2: Fix png leak"