am 5b66af54: Merge "Fix clang build." * commit '5b66af5477511ee2f0d68f7267dd4b62c77ff5d9': Fix clang build.