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

Change-Id: I9f59ede802dca8703b885179cdc5efa3ff731d52