Merge "Remove clang: true"
am: 3080778f3b

Change-Id: I7c541d0cb4369290b0ac45996e271c015de0f206