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

Change-Id: Iff97232ce1ecd46ef54b714485c61e6c934c0c75