am 047ca65c: am 839fc5d6: am c7e064b8: am 16636e4b: Merge "Refresh 64-bit headers and libs"

* commit '047ca65c2d41469a88c3b2aeba0f397d8d7a708c':