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

Change-Id: Ib4b7924a708f88c38c4f2686bbba3486751f8579