Re-add build barriers

Change-Id: I531300d723aab8d8e038db36802cd4950480a4b6