Merge "Remove clang: true" am: b0f52a0eff am: d259172333 am: 284c2e9678
am: 97b87371ae

Change-Id: I6f1fff4f4e9770e263531ea5a5306774de9fdb1a