Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26
tree: cd2d2ad664fb8ba7ba20f8af77a7d7e1ff854548
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml