Merge "tools: Use soong_ui instead of make"
am: 758aeab86b

Change-Id: I9eefdb38f8c6ce399e243919e9bcba005dab10ec