Bug 925411 - Temporarily backout patch for bug 868646 for causing this bug. r=spohl
Remove the unused UnexpectedFailure static function to fix my build, no bug
Bug 921180 - Use b2g-bin if it exists, r=ahal