Merge "Remove obsolete clang makefiles" am: 4a477d5f9d
am: 63f0e44e47

Change-Id: I1494e947a0e5c0dec8ff443ca07b325fbfc86d3d