Merge "Convert tools/upstream to Android.bp"