Merge "Convert development/tools to Android.bp"