Snap for 4649591 from bb9573c1 to oreo-mr1-cts-release

Change-Id: I5539b6f82b494b220bd21bed3a6ad852946a75f8

liblog/tests/Android.mk

@@ -55,7 +55,6 @@ test_c_flags := \
     -fno-builtin \
 
 cts_src_files := \
-    libc_test.cpp \
     liblog_test_default.cpp \
     liblog_test_local.cpp \
     liblog_test_stderr.cpp \
@@ -68,6 +67,7 @@ cts_src_files := \
     log_wrap_test.cpp
 
 test_src_files := \
+    libc_test.cpp \
     $(cts_src_files) \
 
 # Build tests for the device (with .so). Run with: