Merge "Remove unused clang-r349610b." am: 84f27e750f am: 7bf3c2e36f
am: 3cbe96b731

Change-Id: If83dc7cdfeeed4d9e269ec0ee4cb3a0fc772f71d