Merge "Make update_prebuilts update/finalize new api surfaces" am: 833764d454 am: 4b5519e5e4

Change-Id: I675675b4a8ffe81d1be89bf5c0cf7cc49c8bba6d