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

Change-Id: Ic47554dc16784bee6c6185386b9572c1e3ba798b