Merge "AAPT2: Refactor PngCrunching"