Merge tag 'android-7.1.2_r24' into cm-14.1

Android 7.1.2 release 24

# gpg: Signature made Fri 30 Jun 2017 01:19:21 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key