Merge "AAPT2: binary parser should be more lenient with files" into oc-dev