Backed out changeset d1b5408d946f (bug 952087) for Android reftest failures.
CLOSED TREE
Back out f122349d9fbd (bug 941725) for debug and ASan bc timeouts in browser_codemirror.js
CLOSED TREE
Merge m-c to fx-team
CLOSED TREE