Reland of Make instrumentation_test_apk depend on their apk_under_test.

Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none

Committed: https://crrev.com/6044a028d31c8459afb0a7ef5df5ab99f51a0db4
Cr-Commit-Position: refs/heads/master@{#375669}

[agrieve, 2016-02-16 16:26:22]

Created Reland of Make instrumentation_test_apk depend on their apk_under_test.

[agrieve, 2016-02-16 18:14:14]

Description was changed from

==========
Reland of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #1 id:1 of https://codereview.chromium.org/1692383002/ )

Reason for revert:
fixing

Original issue's description:
> Revert of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #2 id:70001 of https://codereview.chromium.org/1690983002/ )
> 
> Reason for revert:
> https://code.google.com/p/chromium/issues/detail?id=586641
> 
> Original issue's description:
> > Reland #2 of Tweak GN deps of instrumentation apks
> > 
> > Reland of https://codereview.chromium.org/1687723002/
> > 
> > This improves build concurrency a little bit.
> > 
> > BUG=none
> 
> TBR=agrieve@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=none

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

to

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

BUG=none
==========

[agrieve, 2016-02-16 18:14:27]

The CQ bit was checked by agrieve@chromium.org to run a CQ dry run

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

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1702663002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1702663002/100001

[agrieve, 2016-02-16 19:01:49]

On 2016/02/16 18:15:23, commit-bot: I haz the power wrote:
> Dry run: CQ is trying da patch. Follow status at
>  https://chromium-cq-status.appspot.com/patch-status/1702663002/100001
> View timeline at
>  https://chromium-cq-status.appspot.com/patch-timeline/1702663002/100001

Looks like this time it was cause by a bad merge? Maybe against
https://codereview.chromium.org/1694703002/?

Either way, you can see that the tryjob in #1 fails, and with the (obvious) fix
in #2, it passes).

[commit-bot: I haz the power, 2016-02-16 19:43:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-02-16 19:43:06]

Dry run: This issue passed the CQ dry run.

[agrieve, 2016-02-16 21:27:08]

Description was changed from

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

BUG=none
==========

to

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none
==========

[agrieve, 2016-02-16 21:27:18]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2016-02-16 21:29:53]

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

[commit-bot: I haz the power, 2016-02-16 21:39:20]

Description was changed from

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none
==========

to

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none
==========

[commit-bot: I haz the power, 2016-02-16 21:39:21]

Committed patchset #2 (id:100001)

[commit-bot: I haz the power, 2016-02-16 22:55:05]

Description was changed from

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none
==========

to

==========
Reland #3 of Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1692383002/

This improves build concurrency a little bit.

TBR=jbudorick
BUG=none

Committed: https://crrev.com/6044a028d31c8459afb0a7ef5df5ab99f51a0db4
Cr-Commit-Position: refs/heads/master@{#375669}
==========

[commit-bot: I haz the power, 2016-02-16 22:55:05]

Patchset 2 (id:??) landed as
https://crrev.com/6044a028d31c8459afb0a7ef5df5ab99f51a0db4
Cr-Commit-Position: refs/heads/master@{#375669}