Merge "AAPT: Dump uses-permission-sdk-23"