Merge "Optimize aapt2 compile for pngs"