am 6bb8a8a5: am 75764b4c: am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs"

* commit '6bb8a8a5988e4c036e9a33735a5985ef7949c53b':
  Update 64-bit headers/libs