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

Change-Id: I20df007276a63d4efd8de0d624f6a72193707e23