Merge "switch to soong"