Merge "Stop using make wrapper around soong_ui" am: 80c05c518b
am: 757926d509

Change-Id: Ied7f4760c696277305b1d5b5f28c9bf6426bed21