Merge "Upgrade emulator kernels 3.10"