Merge tag 'android-8.1.0_r1' into o8.0-rebase

Android 8.1.0 Release 1 (OPM1.171019.011)

# gpg verification failed.