Merge "Remove clang: true"
am: e23acdf535

Change-Id: I87c3e37f297d0af8d22c7384861d1d1f0e39b916