Bug 961949 - [Tarako]: Integrate tarako manifest file. r=mchen
Bug 957526: add emulator-kk and emulator-x86-kk
Merge pull request #323 from vicamo/bugzilla/957526/emulator-kitkat

Bug 957526: add emulator-kk and emulator-x86-kk
Merge pull request #317 from msliu/master

Bug 961949 - [Tarako]: Integrate tarako manifest file. r=mchen