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

* commit '16636e4bf101847c57b6bcb2d54635e7c41b6941':
  Refresh 64-bit headers and libs