Merge e518cda for LLVM update to 353983 Change-Id: Ibfd1e984fc06fcc23d37ac47905503e14261dd5d