Remove clang: true am: 58ed9a7546
am: ca9b62f057

Change-Id: Ic923abf39628e9e5a36df25d669bd8fc04e9f86c