Merge "Fix clang 3.2 warnings."