Backed out changeset 9d86b9442f0b (bug 975011) for Windows debug test bustage that only appears on clobber builds.
CLOSED TREE
Merge m-c to b2g-inbound on a CLOSED TREE. a=merge