Update instrumentation tests to use PreTestHooks for policies

components/policy.gypi

Index: components/policy.gypi
diff --git a/components/policy.gypi b/components/policy.gypi
index d032ace8f37f5c555af4fb2b0762410c3fa38fa7..1587d5b56428cbcd31daf8c523ea0eb7e79ed1ed 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -355,7 +355,7 @@
         {
           'target_name' : 'policy_jni_headers',
           'type': 'none',
-          'sources': [ 
+          'sources': [
             'policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java',
             'policy/android/java/src/org/chromium/policy/PolicyConverter.java',
            ],
@@ -422,6 +422,20 @@
           },
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          # GN: //components/policy/android:policy_java_test_support
+          'target_name': 'policy_java_test_support',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_java_test_support',
+            'policy_java'
+          ],
+          'variables': {
+            'java_in_dir': 'policy/android/javatests',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
       ],
     }],
     ['OS=="win" and target_arch=="ia32" and configuration_policy==1', {