Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode"