Bug 885630 - include Mozilla changes for emulator. r=mwu

Change-Id: I1e61bf5171fb30189819cd9c359cec1ca72b77d1