Bug 650161 - Fix build error in non-unified builds r=me