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

* commit '40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23