Merge "Convert Android.mk file to Android.bp"