Merge changes I8bf2248a,I17aaca24

* changes:
  Upgrade emulator kernels 3.10
  update_emu_kernels.sh: update 3.10 kernel locations.