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