Merge "use prebuilt for the shim" into nyc-dev