Switch emulator to generate userdebug images by default am: ba740ff57f
am: 796f000346

* commit '796f0003464da70f42346a0240fe8d4142706ff1':
  Switch emulator to generate userdebug images by default