Also reduces changes between tutorial chapters. llvm-svn: 245472
Conflicts: examples/Makefile llvm-svn: 82574