Merge "Remove clang: true"
am: 3aec53612c

Change-Id: I0c0823c176959b9e11b7ec3df284acaa0b6a86f9