Merge "Convert tools/device-setup/**/Android.mk files to Android.bp"
am: 425a71f641

Change-Id: I0d81a73e195390d42a37cc9a77ea1c983eb92b10