Merge "Use new custom task to build emulator." into idea133
 Auto-merge: be03c03

* commit 'be03c03bfdb0b2c7564625335256b569a872dda3':
  Use new custom task to build emulator.