Merge "Convert development/tools to Android.bp"
am: 5f3caed3a7

Change-Id: Idff3eb74752864974c9edbd68923cf98ed139793