Merge "AAPT2: Add option to disable PNG crunching" into oc-dev