Merge "tools: Use soong_ui instead of make"