Merge "Convert external/smali to Android.bp"