Bug 967337 - Only run non-unified builds on trunk. r=catlee