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

Change-Id: Ie471641c9b5fdb38c9623cc35cb3cc41c05c28a5