Merge "Remove obsolete clang makefiles" am: 4a477d5f9d am: 63f0e44e47 am: 6970566eea
am: 2e8872016e

Change-Id: Ia1c2779218516ad6d80368d44df6f5b818483679