Merge tag 'android-6.0.1_r22' into mm

Android 6.0.1 release 22
tree: ea20963a3d6d555fa32e8f02b60b5f0bd04e4319
  1. res/
  2. src/
  3. tests/
  4. proguard.flags