fix jni build. Full .apk now produced.

But it gets confused about downloading wordlists.

xwords4/android/jni/Android.mk

@@ -3,10 +3,10 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-COMMON_PATH=../../../common
+COMMON_PATH=../../common
 LOCAL_C_INCLUDES+= \
 	-I$(LOCAL_PATH)/$(COMMON_PATH) \
-	-I$(LOCAL_PATH)/../../../relay \
+	-I$(LOCAL_PATH)/../../relay \
 
 LOCAL_LDLIBS += -llog
 
@@ -61,7 +61,7 @@ LOCAL_SRC_FILES +=         \
 	jniutlswrapper.c       \
 
 
-COMMON_PATH=../../../common
+COMMON_PATH=../../common
 COMMON_SRC_FILES +=        \
 	$(COMMON_PATH)/boarddrw.c   \
 	$(COMMON_PATH)/scorebdp.c   \

xwords4/android/scripts/ndkbuild.sh

@@ -4,8 +4,8 @@ set -e -u
 
 ANDROID_NDK=${ANDROID_NDK:-''}
 
-if [ ! -e build.xml ]; then
-    echo "no build.xml; please run from root of source tree"
+if [ ! -d jni ]; then
+    echo "no jni directory; please run from root of source tree"
     exit 1
 fi