Bug 1104198 - Make DESKTOP builds work with mulet, remove DESKTOP_SHIMS.
Merge pull request #26752 from eeejay/bug-1104198-take-3

Bug 1104198 - Make DESKTOP builds work with mulet, remove DESKTOP_SHIMS. r=ochameau