Merge "Refresh 64-bit headers/libs (WW36)"