Backed out changeset bc9b9c1c8ab5 (bug 1723445) for causing GTest crashes.

CLOSED TREE

xpcom/build/BinaryPath.h

@@ -135,9 +135,9 @@ class BinaryPath {
 
 #elif defined(ANDROID)
   static nsresult Get(char aResult[MAXPATHLEN]) {
-    // On Android, we use the MOZ_ANDROID_LIBDIR variable that is set by the
-    // Java bootstrap code.
-    const char* greHome = getenv("MOZ_ANDROID_LIBDIR");
+    // On Android, we use the GRE_HOME variable that is set by the Java
+    // bootstrap code.
+    const char* greHome = getenv("GRE_HOME");
     if (!greHome) {
       return NS_ERROR_FAILURE;
     }