bug 882691 - m-c inari + inari-eng builds. r=catlee

--HG--
extra : rebase_source : 9959a372273a3e5798af477ffc114144b08bd7b8