Revert of Make instrumentation_test_apk depend on their apk_under_test.

Revert of Make instrumentation_test_apk depend on their apk_under_test. (patchset #2 id:70001 of https://codereview.chromium.org/1687723002/ )

Reason for revert:
Speculative revert to try to fix widespread Android build failures: http://crbug.com/586120

Original issue's description:
> Tweak GN deps of instrumentation apks
>
> Reland of https://codereview.chromium.org/1683823002/
>
> This improves build concurrency a little bit.
>
> BUG=none

TBR=jbudorick@chromium.org,iclelland@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Committed: https://crrev.com/0a5c74a4518334715b56dd54c7749a1b2c856ea6
Cr-Commit-Position: refs/heads/master@{#374895}

[hartmanng, 2016-02-11 15:15:52]

Created Revert of Make instrumentation_test_apk depend on their apk_under_test.

[commit-bot: I haz the power, 2016-02-11 15:16:06]

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

[commit-bot: I haz the power, 2016-02-11 15:18:15]

Committed patchset #1 (id:1)

[agrieve, 2016-02-11 17:03:19]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1690983002/ by agrieve@chromium.org.

The reason for reverting is: going to fix it.

[commit-bot: I haz the power, 2016-02-16 22:35:32]

Description was changed from

==========
Revert of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #2 id:70001 of https://codereview.chromium.org/1687723002/ )

Reason for revert:
Speculative revert to try to fix widespread Android build failures:
http://crbug.com/586120

Original issue's description:
> Tweak GN deps of instrumentation apks
> 
> Reland of https://codereview.chromium.org/1683823002/
> 
> This improves build concurrency a little bit.
> 
> BUG=none

TBR=jbudorick@chromium.org,iclelland@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
==========

to

==========
Revert of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #2 id:70001 of https://codereview.chromium.org/1687723002/ )

Reason for revert:
Speculative revert to try to fix widespread Android build failures:
http://crbug.com/586120

Original issue's description:
> Tweak GN deps of instrumentation apks
>
> Reland of https://codereview.chromium.org/1683823002/
>
> This improves build concurrency a little bit.
>
> BUG=none

TBR=jbudorick@chromium.org,iclelland@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Committed: https://crrev.com/0a5c74a4518334715b56dd54c7749a1b2c856ea6
Cr-Commit-Position: refs/heads/master@{#374895}
==========

[commit-bot: I haz the power, 2016-02-16 22:35:33]

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