Bug 814556 - 1/3: Move mozilla::dom::icc::* to mozilla::dom
Bug 814556 - 2/3: Don't guard MozTelephony with MOZ_B2G_RIL.
Bug 814556 - 3/3: clean up {b2g,browser}/installer/package-manifest.in