Merge "fastboot: demote OS X USB error."
am: 9426110d37

Change-Id: Ia11a1d53ca7e2ef462ec9704b6dfe3639d6b8366