Merge "tests: remove LOCAL_CLANG" am: e77be9c610
am: 24b36003d4

Change-Id: I505a6ddaa90658f0996cbaf7216023fdfa7c0409