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

Change-Id: Ibe1b3bdd44adcd985a88c0fc10ca0f7fa2754c96