Android m preview 1
Merge "Fix RemoteAndroidTestRunnerTest after I broke it." into studio-1.4-dev automerge: b5c6108
automerge: dec66f3

* commit 'dec66f3b0c9c00701d16db148709ea3c5e3f7558':
  Fix RemoteAndroidTestRunnerTest after I broke it.