Merge "Fix fastbootd build for 64-bit."