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

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