Bug xxx: add emulator-kk and emulator-x86-kk

Change-Id: I49d14ae518a21ccc355b8641e994bc118eb89e59