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

Change-Id: I87e0bf3432a0e8e7a41655eba6aa6abf1c6ec451