Merge "Remove clang: true"
am: e13eb9ee1f

Change-Id: I812008219b874aea1a568c28f638cab27f5af728