Bug 1069655 - Fix build errors in non-unified builds r=me