Bug 918288 - Follow-up to fix non-unified build bustage. r=me