Remove LOCAL_CLANG am: 6fab99202f
am: 857775eb36

Change-Id: Ibd1cbd6d5336ab88d74711857d488ec7de513ef4