Merge "Remove USE_SOONG=false option"