Merge "Fix host build with clang 3.3"