Merge "Stop using make wrapper around soong_ui"