am 2e73dbae: am 16059f76: (-s ours) am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging."

* commit '2e73dbae2abe9f4d5c0ea7775dfb580f12528508':