am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs"

* commit '97af261912dae1863ecf63de238a48b171ad9e4e':
  Update 64-bit headers/libs