Merge "Compile BufferHubServer_test for 64-bit on a 64-bit platform"