Merge "tools: Move to Soong." am: 6b16093b29 am: 9016deefe4
am: f91fdfb3fc

Change-Id: Ibfbd0d8324af6145773b716cb14177c3cd5b3abf