am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X"

* commit '2a2c2036a75f1dcee9a4a65a03e646b05df76ab4':
  Get fastboot working on OS X