Bug 889963 - Unbust |mach build| when build terminal isn't present; r=ted

DONTBUILD (NPOTB)
No bug, Automated HSTS preload list update from host bld-linux64-ec2-324 - a=hsts-update
Bug 884134 - Fix ifdef to un-break B2G mochitest-3.