Merge "Updates to match prebuilts drop" into pi-dev