Merge "Convert development/tools to Android.bp" am: 5f3caed3a7 am: 6f3ae7994a
am: 08d7d58b5b

Change-Id: I7193770faed4c37be27e9629d70809059e608061