am 5f3ed7dd: am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"

* commit '5f3ed7ddd0b3708baadf5ce357c74e331c16f986':
  Refresh 64-bit headers/libs (WW20)