resolve merge conflicts of a7cad44 to nyc-dev-plus-aosp

Change-Id: I7a2be81755faf45d1aee4d51ced279e16eb2f11a

diff --cc audio_utils/Android.mk
index 7f08446,e3b63f5..a467fe6
--- 1/audio_utils/Android.mk
--- 2/audio_utils/Android.mk
+++ b/audio_utils/Android.mk
@@@ -44,7 -44,8 +45,9 @@@ LOCAL_SRC_FILES := 
        roundup.c
  LOCAL_C_INCLUDES += \
        $(call include-path-for, audio-utils)
- LOCAL_CFLAGS := -D__unused= -Wno-unused-parameter
+ LOCAL_CFLAGS := -Werror -Wall
+ LOCAL_CFLAGS += -D__unused='__attribute__((unused))'
++#LOCAL_CFLAGS += -Wno-unused-parameter
  include $(BUILD_HOST_STATIC_LIBRARY)
  
  include $(CLEAR_VARS)

diff --cc brillo/audio/audioservice/Android.mk
index 5246b1c,8d4fb15..09da9f7
--- 1/brillo/audio/audioservice/Android.mk
--- 2/brillo/audio/audioservice/Android.mk
+++ b/brillo/audio/audioservice/Android.mk
@@@ -36,11 -28,11 +36,11 @@@ audio_service_sources := 
  include $(CLEAR_VARS)
  LOCAL_MODULE := brilloaudioservice
  LOCAL_SRC_FILES := \
 -  audio_daemon.cpp \
 -  audio_device_handler.cpp \
 +  $(audio_service_sources) \
    main_audio_service.cpp
 +LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl
  LOCAL_SHARED_LIBRARIES := $(audio_service_shared_libraries)
- LOCAL_CFLAGS := -Wall
+ LOCAL_CFLAGS := -Werror -Wall
  LOCAL_INIT_RC := brilloaudioserv.rc
  include $(BUILD_EXECUTABLE)