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

* commit '80bc4f931edb0c56473ba89a132e56ac99995420':
  Refresh 64-bit headers/libs (WW20)