Feature backport prebuilt rejig

Note: there are corresponding pull requests in thirdparty and private that will also need to be merged.