Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312 am: b0e8a507ac
am: 2affd4cac1

Change-Id: I8900100cf29ceec8b9d795b8772104670b44f4ab