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

* commit '7f5ad223306a482bdf33d213971af041e9fba590':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23