Use `buildprefix` in a few more places (cherry picked from commit b6a3fde6b7) Change-Id: I2790663fa9f8242ac2db6582b7e421d2fdf42942
b6a3fde6b7
I2790663fa9f8242ac2db6582b7e421d2fdf42942