Backed out changeset 2f15518f566e (bug 912702) because of B2G JB Emulator build bustage

--HG--
extra : rebase_source : 6c01ad3bc2f91b0e7e3edab84aedbfe064310a8b