Android 7.1.2 release 23
DO NOT MERGE Upgrade emulator kernels
am: 054873c1d2

Change-Id: Iceedc749902ce532ddfff32ea971515e8673da6d