Add apk and Android.mk