Merge "AAPT2: Add option to disable PNG crunching" into oc-dev am: fb194bb81c
am: 71aab90db2

Change-Id: I9778a232e2664a4da66fb315347bd195c13492ad