Bug 952486 - backout for breaking all device and emulator builds (keeping dom reviewer to land the backout...) r=bz