Merge tag 'android-6.0.1_r30' into develop

Android 6.0.1 release 30

# gpg: Signature made Mon 11 Apr 2016 05:43:57 PM EDT using DSA key ID 9AB10E78
# gpg: Can't check signature: No public key