Merge "Convert memeater/Android.mk to Android.bp"