Merge 16595a2 for LLVM update to 333878

Change-Id: Ie031d14a79847836ce6c00800977eb185d437ef6