Merge change 20030

* changes:
  Use the new ScriptC.Builder API.