put build barrier back

Change-Id: Id4d1ed7239449dfc7662b9e9652969e71b4f9a2f