DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2
am: 8c9209183f

* commit '8c9209183fa67953bebe1adb5dfb529c1b6273f0':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23