Merge "Convert dx to Android.bp"