Back out 679e69e79fe2 (bug 965945) for causing C2 bustage on B2G emulator builds. r=backout
Merge m-c to b2g-inbound.