Remove clang: true am: fb49aba884
am: 2b9681d6f2

Change-Id: I30af222c645b8776b1cbf441acbaf95af42f454c