Merge "Remove clang: true" am: 3080778f3b
am: b979f180ce

Change-Id: I283af2e342960c3732db270bfca3f96787b24f37