am 839fc5d6: am c7e064b8: am 16636e4b: Merge "Refresh 64-bit headers and libs"

* commit '839fc5d698ccf16489a2527ce892d78d5d635e3c':
  Refresh 64-bit headers and libs