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

Change-Id: I9d5a48eb8ad38461c0940ad0d6fc6dbe0030e794