Bug 975900 follow-up to fix unified build failures. r=me on CLOSED TREE