am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"

* commit '844bc1d331a8714fbc54492ed119e0db86555d36':
  Refresh 64-bit headers/libs (WW21)