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

Change-Id: I8d9c773c2d3dc2fb3d5a8604536ee27cbf88c38b