Revert of [Android] Refactor the native test wrappers.

Revert of [Android] Refactor the native test wrappers. (patchset #7 id:120001 of https://codereview.chromium.org/1126543009/)

Reason for revert:
broke http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android

e.g. http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android/builds/1922

Original issue's description:
> [Android] Refactor the native test wrappers.
>
> BUG=476410
>
> Committed: https://crrev.com/581d25e509e4a2b1e8927c6d8accc0c90ea86090
> Cr-Commit-Position: refs/heads/master@{#330531}

TBR=jochen@chromium.org,cjhopman@chromium.org,jaekyun@chromium.org,perezju@chromium.org,tedchoc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=476410
Committed: https://crrev.com/6cdb69279cb4f83fd8d1f31f58eb0edf44d2bec3
Cr-Commit-Position: refs/heads/master@{#330591}

[jbudorick, 2015-05-19 20:03:31]

Created Revert of [Android] Refactor the native test wrappers.

[commit-bot: I haz the power, 2015-05-19 20:05:45]

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

[commit-bot: I haz the power, 2015-05-19 20:08:20]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-05-19 20:09:38]

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