Bug 942167: Add support for non unified builds r=rail