Merge "libnativehelper: convert Android.mk to Android.bp"