Bug 1097116 - More build bustage r=me

--HG--
extra : rebase_source : 74dce437c198a17280d1fdf459d4e87a64808b21