Merge remote-tracking branch 'google-origin/master' into merge_37 Conflicts: tools/CMakeLists.txt tools/opt/Makefile tools/pnacl-llc/Makefile