Merge "Fix prebuilts update script" into oc-dev