Bug 935508. Follow-up to fix unified build bustage.

--HG--
extra : rebase_source : b8429c6f04bf4ac84b63940657deafe4a4bf9fac