Bug 998863: Fix non-unified build bustage r=bustage

--HG--
extra : rebase_source : 521f9fd6ce378021fa560c198b1d7b2f47ad4462