Android 7.1.0 release 3
Merge "Upgrade emulator kernels" into nyc-dev
am: 926dd56874

* commit '926dd56874ce45313da295174e594dfd534137d2':
  Upgrade emulator kernels

Change-Id: I58e73fe15496e7ade013f0f48f509f70fc001c10