am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit '21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d':
  Fix fastbootd build for 64-bit.