am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)"

* commit '61b90c04ede2ddf741f43ff279c5684bfc95d634':
  Refresh 64-bit headers/libs (WW36)