Merge e0330b6 for LLVM update to 333878

Change-Id: I14188f576bffec5ce6096a6671e71a7ec94b1f25