Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
am: e7172ff9fb

Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807