Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix im/build.mk, r=clokep.