DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330 am: 1f7a36b8e6
am: 087e0fcba6  -s ours

* commit '087e0fcba687bce677f39fd2b708a9cbb1defcd0':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23