Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev