Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
am: b9dbee430d

Change-Id: I64df2268e9dbc80fe4630c068ad8ee58ced5765e