merge/simplify Android.mk+Makefile-jni generation