Remove clang: true am: fb49aba884 am: 2b9681d6f2 am: 3aa63476fb
am: 9f14f5dc03

Change-Id: If1d3c645290c5757277d307bd02dee80988badbd