Merge "Remove clang: true" am: cfa6888d2b am: 72c4a54ddb am: 12147281be am: 67a5b42c8c
am: d2a042e071

Change-Id: Icd3334b05403797b98451bd40627a573dc445fd1