Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix update packaging in im/build.mk, rs=bustage-fix.