Merge 24c7353aa for LLVM update to 316199

Change-Id: I45444731d201b7ab97293d9ccd232fb9b36a68d7