am be5b713a: am 7f4142f2: Merge "Refresh 64-bit headers/libs (WW22)"

* commit 'be5b713adfef26029b747d4a29ec1a5f54dd596a':
  Refresh 64-bit headers/libs (WW22)