Merge "Use new custom task to build emulator." into idea133