core/jni/Android.mk: fix incomplete merge