Backed out changeset aebdc69b02e5 (bug 870676)
Backed out changeset a9ffc1cdb1ae (bug 870676)
Backout manual conflict resolution from merge (bug 870676)
Backed out changeset 5a71d3bf48ce (bug 870676)
Backed out changeset cd99d10fc665 (bug 870676) for breaking B2G device image builds on a CLOSED TREE
Bug 875934 - Moar fixups post backout of bug 870676 \o/