Merge tag 'android-7.1.1_r4' into cm-14.1

Android 7.1.1 release 4

# gpg: Signature made Thu Dec  1 13:07:03 2016 CST
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key