Reland of Fix android_junit_tests and add a GN target for them.

Reland of Fix android_junit_tests and add a GN target for them. (patchset #1 id:1 of https://codereview.webrtc.org/2345163003/ )

Reason for revert:
Bring back the include I managed to accidentally remove.

Original issue's description:
> Revert of Fix android_junit_tests and add a GN target for them. (patchset #3 id:90001 of https://codereview.webrtc.org/2344133002/ )
>
> Reason for revert:
> Breaks bots.
>
> Original issue's description:
> > Reland of Fix android_junit_tests and add a GN target for them. (patchset #1 id:1 of https://codereview.webrtc.org/2341213003/ )
> >
> > Reason for revert:
> > Fix the issue.
> >
> > Original issue's description:
> > > Revert of Fix android_junit_tests and add a GN target for them. (patchset #1 id:20001 of https://codereview.webrtc.org/2346793002/ )
> > >
> > > Reason for revert:
> > > Breaks WebRTC in Chrome on Android:
> > >
> > > https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20Builder%20(dbg)
> > >
> > > Original issue's description:
> > > > Fix android_junit_tests and add a GN target for them.
> > > >
> > > > BUG=webrtc:6365
> > > > NOTRY=True
> > > >
> > > > Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> > > > Cr-Commit-Position: refs/heads/master@{#14241}
> > >
> > > TBR=magjed@webrtc.org,kjellander@webrtc.org,sakal@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:6365
> > >
> > > Committed: https://crrev.com/9adb1ff9439aecf4e8ac3972a631bb74df2b6868
> > > Cr-Commit-Position: refs/heads/master@{#14253}
> >
> > TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:6365
> >
> > Committed: https://crrev.com/51fe1d805d19bf7c79aad46049d040fae1ae6953
> > Cr-Commit-Position: refs/heads/master@{#14254}
>
> TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6365
>
> Committed: https://crrev.com/1431d49ea073d88b65303ab843545678fbb6e9f9
> Cr-Commit-Position: refs/heads/master@{#14255}

TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6365
Committed: https://crrev.com/80a5bf14990159d25df71e9ab3015a1e9f155589
Cr-Commit-Position: refs/heads/master@{#14264}

[sakal, 2016-09-16 11:37:33]

Created Reland of Fix android_junit_tests and add a GN target for them.

[magjed_webrtc, 2016-09-16 11:49:58]

lgtm

[sakal, 2016-09-16 14:22:04]

The CQ bit was checked by sakal@webrtc.org

[commit-bot: I haz the power, 2016-09-16 14:22:12]

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

[commit-bot: I haz the power, 2016-09-16 14:22:20]

Committed patchset #2 (id:40001)

[commit-bot: I haz the power, 2016-09-16 14:22:23]

Description was changed from

==========
Reland of Fix android_junit_tests and add a GN target for them. (patchset #1
id:1 of https://codereview.webrtc.org/2345163003/ )

Reason for revert:
Bring back the include I managed to accidentally remove.

Original issue's description:
> Revert of Fix android_junit_tests and add a GN target for them. (patchset #3
id:90001 of https://codereview.webrtc.org/2344133002/ )
> 
> Reason for revert:
> Breaks bots.
> 
> Original issue's description:
> > Reland of Fix android_junit_tests and add a GN target for them. (patchset #1
id:1 of https://codereview.webrtc.org/2341213003/ )
> >
> > Reason for revert:
> > Fix the issue.
> >
> > Original issue's description:
> > > Revert of Fix android_junit_tests and add a GN target for them. (patchset
#1 id:20001 of https://codereview.webrtc.org/2346793002/ )
> > >
> > > Reason for revert:
> > > Breaks WebRTC in Chrome on Android:
> > >
> > >
https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20...
> > >
> > > Original issue's description:
> > > > Fix android_junit_tests and add a GN target for them.
> > > >
> > > > BUG=webrtc:6365
> > > > NOTRY=True
> > > >
> > > > Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> > > > Cr-Commit-Position: refs/heads/master@{#14241}
> > >
> > > TBR=magjed@webrtc.org,kjellander@webrtc.org,sakal@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:6365
> > >
> > > Committed: https://crrev.com/9adb1ff9439aecf4e8ac3972a631bb74df2b6868
> > > Cr-Commit-Position: refs/heads/master@{#14253}
> >
> > TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:6365
> >
> > Committed: https://crrev.com/51fe1d805d19bf7c79aad46049d040fae1ae6953
> > Cr-Commit-Position: refs/heads/master@{#14254}
> 
> TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6365
> 
> Committed: https://crrev.com/1431d49ea073d88b65303ab843545678fbb6e9f9
> Cr-Commit-Position: refs/heads/master@{#14255}

TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6365
==========

to

==========
Reland of Fix android_junit_tests and add a GN target for them. (patchset #1
id:1 of https://codereview.webrtc.org/2345163003/ )

Reason for revert:
Bring back the include I managed to accidentally remove.

Original issue's description:
> Revert of Fix android_junit_tests and add a GN target for them. (patchset #3
id:90001 of https://codereview.webrtc.org/2344133002/ )
>
> Reason for revert:
> Breaks bots.
>
> Original issue's description:
> > Reland of Fix android_junit_tests and add a GN target for them. (patchset #1
id:1 of https://codereview.webrtc.org/2341213003/ )
> >
> > Reason for revert:
> > Fix the issue.
> >
> > Original issue's description:
> > > Revert of Fix android_junit_tests and add a GN target for them. (patchset
#1 id:20001 of https://codereview.webrtc.org/2346793002/ )
> > >
> > > Reason for revert:
> > > Breaks WebRTC in Chrome on Android:
> > >
> > >
https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20...
> > >
> > > Original issue's description:
> > > > Fix android_junit_tests and add a GN target for them.
> > > >
> > > > BUG=webrtc:6365
> > > > NOTRY=True
> > > >
> > > > Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> > > > Cr-Commit-Position: refs/heads/master@{#14241}
> > >
> > > TBR=magjed@webrtc.org,kjellander@webrtc.org,sakal@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:6365
> > >
> > > Committed: https://crrev.com/9adb1ff9439aecf4e8ac3972a631bb74df2b6868
> > > Cr-Commit-Position: refs/heads/master@{#14253}
> >
> > TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:6365
> >
> > Committed: https://crrev.com/51fe1d805d19bf7c79aad46049d040fae1ae6953
> > Cr-Commit-Position: refs/heads/master@{#14254}
>
> TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6365
>
> Committed: https://crrev.com/1431d49ea073d88b65303ab843545678fbb6e9f9
> Cr-Commit-Position: refs/heads/master@{#14255}

TBR=magjed@webrtc.org,kjellander@webrtc.org,henrika@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6365

Committed: https://crrev.com/80a5bf14990159d25df71e9ab3015a1e9f155589
Cr-Commit-Position: refs/heads/master@{#14264}
==========

[commit-bot: I haz the power, 2016-09-16 14:22:24]

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