Check variable PRODUCT_DIR firstly for content shell test

content/shell/android/javatests/content_shell_test_apk.xml

Index: content/shell/android/javatests/content_shell_test_apk.xml
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
index 497a81c9b6a0d13ba9a018f0bc496a1a711e0935..ad03afef2900d7200d5062a96aaee8ec72163a9f 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -33,18 +33,13 @@
 
   <!-- We expect PRODUCT_DIR to be set like the gyp var
        (e.g. $ROOT/out/Debug) -->
-  <!-- TODO(satish): ideally we need this to run before -build-setup, where
-       directories are made based on this variable. -->
-  <target name="-pre-build">
-    <if>
-      <condition>
-        <isset property="PRODUCT_DIR" />
-      </condition>
-      <else>
-        <fail message="PRODUCT_DIR env var not set?" />
-      </else>
-    </if>
-  </target>
+  <fail message="PRODUCT_DIR env var not set?">
+    <condition>
+      <not>
+        <isset property="PRODUCT_DIR"/>
+      </not>
+    </condition>
+  </fail>
 
   <target name="-post-compile">
     <!-- copy gdbserver to main libs directory if building debug.