Merge tag 'android-8.0.0_r34' of https://android.googlesource.com/platform//system/extras into HEAD

Android 8.0.0 release 34