Merge 36f54002c93 for LLVM update to 339409

Change-Id: I4dbbcaf106b5ea88756f940e3fc13cf55cbfeb7d