Revert of [Android] Switch instrumentation tests to platform mode. (RELAND)

Revert of [Android] Switch instrumentation tests to platform mode. (RELAND) (patchset #2 id:20001 of https://codereview.chromium.org/1836883002/ )

Reason for revert:
broke mojo on Android GN: https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/33530

Original issue's description:
> [Android] Switch instrumentation tests to platform mode. (RELAND)
>
> This is a reland of https://codereview.chromium.org/1387933005/
>
> BUG=428729
>
> Committed: https://crrev.com/a46e07369fc36afae9fab7506640eb76ff9b925a
> Cr-Commit-Position: refs/heads/master@{#383729}

TBR=mikecase@chromium.org,rnephew@chromium.org,bpastene@chromium.org,martiniss@chromium.org,yfriedman@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=428729
Committed: https://crrev.com/2617c7e81b90aaead5698a08a2429b698af9d09a
Cr-Commit-Position: refs/heads/master@{#383758}

[jbudorick, 2016-03-29 17:41:36]

Created Revert of [Android] Switch instrumentation tests to platform mode.
(RELAND)

[commit-bot: I haz the power, 2016-03-29 17:42:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1843713002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1843713002/1

[commit-bot: I haz the power, 2016-03-29 17:42:34]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-03-29 17:44:22]

Description was changed from

==========
Revert of [Android] Switch instrumentation tests to platform mode. (RELAND)
(patchset #2 id:20001 of https://codereview.chromium.org/1836883002/ )

Reason for revert:
broke mojo on Android GN:
https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/33530

Original issue's description:
> [Android] Switch instrumentation tests to platform mode. (RELAND)
> 
> This is a reland of https://codereview.chromium.org/1387933005/
> 
> BUG=428729
> 
> Committed: https://crrev.com/a46e07369fc36afae9fab7506640eb76ff9b925a
> Cr-Commit-Position: refs/heads/master@{#383729}

TBR=mikecase@chromium.org,rnephew@chromium.org,bpastene@chromium.org,martinis...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=428729
==========

to

==========
Revert of [Android] Switch instrumentation tests to platform mode. (RELAND)
(patchset #2 id:20001 of https://codereview.chromium.org/1836883002/ )

Reason for revert:
broke mojo on Android GN:
https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/33530

Original issue's description:
> [Android] Switch instrumentation tests to platform mode. (RELAND)
>
> This is a reland of https://codereview.chromium.org/1387933005/
>
> BUG=428729
>
> Committed: https://crrev.com/a46e07369fc36afae9fab7506640eb76ff9b925a
> Cr-Commit-Position: refs/heads/master@{#383729}

TBR=mikecase@chromium.org,rnephew@chromium.org,bpastene@chromium.org,martinis...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=428729

Committed: https://crrev.com/2617c7e81b90aaead5698a08a2429b698af9d09a
Cr-Commit-Position: refs/heads/master@{#383758}
==========

[commit-bot: I haz the power, 2016-03-29 17:44:23]

Patchset 1 (id:??) landed as
https://crrev.com/2617c7e81b90aaead5698a08a2429b698af9d09a
Cr-Commit-Position: refs/heads/master@{#383758}