Merge "Update 64-bit headers/libs"