merge pnacl's clang 3.4 merge