Back out 4bb5a77c36a6:88a3198c7007 (bug 900669) for b2g build failures
CLOSED TREE
Back out revisions 042d50591265:69f4af72765c (bug 909645) due to Windows bustage causing a CLOSED TREE.