Backed out changeset 76f6f3d6d8e3 (bug 522393) for Werror bustage.
Bug 985295 - give WebappsUpdateTimer component a unique contract ID; r=mfinkle

--HG--
extra : rebase_source : a70c296dabe2cbb1ca5ef639a004d12f15c66469
Bug 985299 - register WebappsUpdateTimer with category manager only if Synthetic APKs enabled; r=mfinkle

--HG--
extra : rebase_source : 036a2f62e0cd89cbc1538f06633b50046282cfd3