Remove clang: true am: bb0e188762 am: a67575afba am: f40e899711
am: 80bf660999

Change-Id: Ic4f81f9a080321105babbf5bc57309a556061288