Bug 879717: bustage fix (unified builds) r=bustage