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

Change-Id: I63b313e0760deeed261f638550cd2f8c297d49da