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

Change-Id: Ief1b27016f7a8555611d1c828d1e71722370ce92