Merge "Remove clang: true" am: 3aec53612c am: d8a4fd2cc0 am: a6661ca5ee
am: c42bd67f2c

Change-Id: I3e1cb3f3b2c4fcc25794d9fe2e1386c66e181b5c