Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

Fixed build breakages:
-Had to add DEPS file for testshell/java.
-Something changed with ant from the time I tested and the time my CL got committed.  Had to move
sdk-targets.xml import in the ant file to the end of the file.

This reverts commit 2d30dc03dc0bd0723236c549313774119f163056.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10905209

git-svn-id: http://src.chromium.org/svn/trunk/src/build@156458 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all_android.gyp

@@ -22,6 +22,13 @@
         '<@(android_app_targets)',
         'android_builder_tests',
       ],
+      'conditions': [
+        ['sdk_build==1', {
+          'dependencies': [
+            '../chrome/chrome.gyp:chromium_testshell',
+          ],
+        }],  # sdk_build==1
+      ],  # conditions
     }, # target_name: All
     {
       # The current list of tests for android.  This is temporary