Merge "AAPT2: Allow multiple -c flags" into oc-dev
am: 7a7e415967

Change-Id: Ifbe2a96da8bc56b052fff69ec4ea8489be1106b3