android-8.0.0_r4

initial-contribution@android.com

e877c8a2 · Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001,... · Jun 23, 2017

Android 8.0.0 release 4