Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 13872)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 13873)
@@ -66,7 +66,9 @@
 
 MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
-export MPI_DIR
-pathprepend   "$MPI_DIR/bin"
-libpathappend "$MPI_DIR/lib"
+if [ -d "$MPI_DIR" ]; then
+	export MPI_DIR
+	pathprepend   "$MPI_DIR/bin"
+	libpathappend "$MPI_DIR/lib"
+fi
 
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
@@ -195,4 +197,5 @@
 export ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install"
 pathappend "$ANDROID_SDK_DIR/"
+pathappend "$ANDROID_DIR/arm-linux-android-4.0/bin/"
 
 GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"