Bug 1053130: non-unified-build bustage r=bustage rs=alfredo