Merge tag 'tags/android-8.1.0_r7' into o8.1

Android 8.1.0 Release 7 (OPM3.171019.013)

# gpg: Signature made Wed Jan  3 02:35:23 2018 CET using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found