Merge "Remove clang: true" am: 3aec53612c
am: d8a4fd2cc0

Change-Id: I1ce7aa9727d8fe58f06ee8e8029581a034f269d4