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