Merge "Make update_prebuilts update/finalize new api surfaces"