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

Change-Id: I96722e1c3d20c35cafa17f155cb648ee4d64ff7f