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