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