Merge "Remove clang: true" am: e13eb9ee1f am: c6ab766458
am: 62cee622c4

Change-Id: I2eececc8a8d43d32d3123568d3c279f79766fad2