Hammerhead: add build barrier

Change-Id: I276de5351731ac53e1056a939e75dc3a841b7add
Merge "Hammerhead: add build barrier" into lp5.0