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

* commit '22532380a29c464cd7039591194a64d3623ca24f':
  Get fastboot working on OS X