Revert "per device build barrier"

This reverts commit f95bc891000d21fb0e328963eedb06eef6f98968.
Merge "Revert "per device build barrier"" into cm-10.1