Revert of Change apk_helper.py for apk with multi instrumentations and JUnit4

Revert of Change apk_helper.py for apk with multi instrumentations and JUnit4 (patchset #10 id:180001 of https://codereview.chromium.org/2632763003/ )

Reason for revert:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/221009/steps/base_unittests%20%28with%20patch%29%20on%20Android/logs/stdio

Original issue's description:
> Change apk_helper.py for apk with multi instrumentations and JUnit4
> 
> Review-Url: https://codereview.chromium.org/2632763003
> Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/e22cb5a59ab593d629131fa69b16bde3ad27d83a

TBR=jbudorick@chromium.org,mikecase@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.

Review-Url: https://codereview.chromium.org/2656103002
Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/a2850da23573892322e8d22c311680040022d0fb

[the real yoland, 2017-01-26 16:51:16]

The CQ bit was checked by yolandyan@chromium.org

[the real yoland, 2017-01-26 16:51:16]

Created Revert of Change apk_helper.py for apk with multi instrumentations and
JUnit4

[commit-bot: I haz the power, 2017-01-26 16:51:18]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-26 17:11:31]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1485449476675310, "parent_rev":
"df48c1645dac70a55dd0578b13a108620a74cb30", "commit_rev":
"a2850da23573892322e8d22c311680040022d0fb"}

[commit-bot: I haz the power, 2017-01-26 17:11:34]

Description was changed from

==========
Revert of Change apk_helper.py for apk with multi instrumentations and JUnit4
(patchset #10 id:180001 of https://codereview.chromium.org/2632763003/ )

Reason for revert:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...

Original issue's description:
> Change apk_helper.py for apk with multi instrumentations and JUnit4
> 
> Review-Url: https://codereview.chromium.org/2632763003
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

TBR=jbudorick@chromium.org,mikecase@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
==========

to

==========
Revert of Change apk_helper.py for apk with multi instrumentations and JUnit4
(patchset #10 id:180001 of https://codereview.chromium.org/2632763003/ )

Reason for revert:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...

Original issue's description:
> Change apk_helper.py for apk with multi instrumentations and JUnit4
> 
> Review-Url: https://codereview.chromium.org/2632763003
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

TBR=jbudorick@chromium.org,mikecase@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.

Review-Url: https://codereview.chromium.org/2656103002
Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========

[commit-bot: I haz the power, 2017-01-26 17:11:35]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...