am ad588372: Merge "Enable clang compilation, use stdatomic.h."

* commit 'ad5883726417d06ee79fa26e4050f8c3a9439578':
  Enable clang compilation, use stdatomic.h.

diff --cc osi/Android.mk
index 08f4f24,473c3fb..f2f5af4
--- 1/osi/Android.mk
--- 2/osi/Android.mk
+++ b/osi/Android.mk
@@@ -117,10 -114,9 +114,9 @@@ endi
  # libosi unit tests for target
  # ========================================================
  include $(CLEAR_VARS)
- LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions
  LOCAL_C_INCLUDES := $(btosiCommonIncludes)
  LOCAL_SRC_FILES := $(btosiCommonTestSrc)
 -LOCAL_CFLAGS := -Wall
 +LOCAL_CFLAGS := -Wall -UNDEBUG
  LOCAL_MODULE := net_test_osi
  LOCAL_MODULE_TAGS := tests
  LOCAL_SHARED_LIBRARIES := liblog
@@@ -131,10 -127,9 +127,9 @@@ include $(BUILD_NATIVE_TEST
  # ========================================================
  ifeq ($(HOST_OS),linux)
  include $(CLEAR_VARS)
- LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions
  LOCAL_C_INCLUDES := $(btosiCommonIncludes)
  LOCAL_SRC_FILES := $(btosiCommonTestSrc)
 -LOCAL_CFLAGS := -Wall
 +LOCAL_CFLAGS := -Wall -UNDEBUG
  LOCAL_LDLIBS := -lrt -lpthread
  LOCAL_MODULE := net_test_osi
  LOCAL_MODULE_TAGS := tests