Merge "Convert more Android.mk files to Android.bp"