Merge "Remove USE_SOONG_UI=false"