Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  DO NOT MERGE: Change permission strings to comply with the system permission UI

Change-Id: Ia5ad7f7297acfe85147fee8164ef3d387a2dc306
tree: 83bb73c48a438b0384d30fe9f5ad704c607be740
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml