Merge "Use soong_ui directly, instead of make"