Merge "Remove clang: true"
am: b0f52a0eff

Change-Id: If18986bbfc45ae743b292bce0edd2baadd1b7512