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

* commit 'c7e064b86384797f08d36c6fdb118a24b22a39fe':
  Refresh 64-bit headers and libs