Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08
am: 8e51db884e

Change-Id: I790d275e30bccd446a00615149a90440d172e163