Merge "Convert more modules to Android.bp"