Merge ea7316f9 for LLVM update to 333878

Change-Id: I0db1e3d363c94ff80f3c9628a6fb6985e924d19a