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

* commit '82b5daf2cd0075f0bcfef106fcd9e1b1141b098a':