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/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}

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

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

[sakal, 2016-09-16 11:25:27]

The CQ bit was checked by sakal@webrtc.org

[commit-bot: I haz the power, 2016-09-16 11:25:37]

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 11:25:40]

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

[commit-bot: I haz the power, 2016-09-16 11:25:42]

Failed to apply patch for webrtc/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: webrtc/BUILD.gn:831
  Falling back to three-way merge...
  Applied patch to 'webrtc/BUILD.gn' with conflicts.
  U webrtc/BUILD.gn

Patch:       webrtc/BUILD.gn
Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index
d61bbd845c13d5558e84a80f9fc8783281b1d6b6..5b5ed165b809f6964b2b86b454e466e1faa3ae0c
100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -831,15 +831,15 @@ if (rtc_include_tests) {
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
-}
 
-if (is_android) {
-  junit_binary("android_junit_tests") {
-    java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
+  if (is_android) {
+    junit_binary("android_junit_tests") {
+      java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
 
-    deps = [
-      "//webrtc/api:libjingle_peerconnection_java",
-      "//webrtc/api:libjingle_peerconnection_jni",
-    ]
+      deps = [
+        "//webrtc/api:libjingle_peerconnection_java",
+        "//webrtc/api:libjingle_peerconnection_jni",
+      ]
+    }
   }
 }

[sakal, 2016-09-16 11:27:46]

The CQ bit was checked by sakal@webrtc.org

[commit-bot: I haz the power, 2016-09-16 11:27:57]

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 11:28:05]

Committed patchset #3 (id:90001)

[commit-bot: I haz the power, 2016-09-16 11:28:09]

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/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
==========

to

==========
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}
==========

[commit-bot: I haz the power, 2016-09-16 11:28:10]

Patchset 3 (id:??) landed as
https://crrev.com/51fe1d805d19bf7c79aad46049d040fae1ae6953
Cr-Commit-Position: refs/heads/master@{#14254}

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

A revert of this CL (patchset #3 id:90001) has been created in
https://codereview.webrtc.org/2345163003/ by sakal@webrtc.org.

The reason for reverting is: Breaks bots..