Merge "Refresh 64-bit headers and libs"