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

Change-Id: I1238656a9edb9984d36412dba506b869f574e3d4