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

Android 7.1.2 Release 29 (NJH47F)

# gpg: Signature made Fri 28 Jul 2017 01:55:54 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key