Bug 896379 - Fix build bootstrapper on fresh OS X installs; r=bsmedberg

DONTBUILD (NPOTB)
Automatic merge