Improved visibility of marionette error message.
Stop these tests from restarting the device (not necessary).
trying to improve the adb reboot (wait for os to be ready) script.
Merge pull request #170 from roydude/v1-train

vitrain