am 00a816e5: Merge "Fix 32-bit issues in tests, and add a trivial test for the FD_* macros."

* commit '00a816e5874153ae3103af869182a81b31445388':
  Fix 32-bit issues in tests, and add a trivial test for the FD_* macros.