android: Build both arm and x86 jni libraries

Uses arm and x86 vstr static libraries
Merge branch 'android-fixes' into android-ipv4v6

Conflicts:
	src/frontends/android/jni/Android.mk