Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix Mac universal builds with Lightning, rs=bustage-fix for CLOSED TREE