Merge "Remove clang: true" am: e23acdf535
am: cfb474398c

Change-Id: I320ca3e08d137229b4553299d1940bb93e81caa5