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

Change-Id: Ic64fb3a0f4a1e1f9bead421012d91e004f91b78e