Merge "Switch emulator to 5.10 kernel (GKI 2.0)"