Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

Conflicts:
	lib/AST/CommentCommandTraits.cpp
	lib/Basic/Targets.cpp
	lib/Driver/ToolChain.cpp
	lib/Driver/ToolChains.cpp
	lib/Driver/ToolChains.h
	lib/Driver/Tools.cpp
	lib/Lex/PPDirectives.cpp
	test/CodeGen/a15.c
	test/Index/c-index-getCursor-pp.c
	www/timing-data/2008-10-31/176.gcc.png
	www/timing-data/2008-10-31/sketch.png
	www/timing-data/2009-03-02/176.gcc.png
	www/timing-data/2009-03-02/sketch.png
	www/timing-data/2009-06-26/176.gcc.png
	www/timing-data/2009-06-26/sketch.png

Change-Id: Id9665cf80c63076df092538bc710fac278e1ee3f