per device build barrier

Change-Id: I0b2973bb36bd18e7f75468eba04a6edfd317de96
Merge remote-tracking branch 'upstream/cm-10.1' into testing