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

* commit '377e5e9b1b61bda7d921b6522117232e96e77db8':
  Update 64-bit headers/libs