Backed out changeset 9b803c2821b9 (bug 818843) due to B2G device build breakage on Mac.  rs=jesup

--HG--
extra : rebase_source : 981d5e9504c69eb76112fca35fd0a36110593659
Backed out changeset e8aa49207d1c (bug 818843) due to B2G device build breakage on Mac OS. rs=jesup

--HG--
extra : rebase_source : e653c34659a198edbcb032a329ce722969447b6d