resolved conflicts for ba95966e to stage-aosp-master

Change-Id: Id468b025222853e5a421300b6e669de999bf737e

diff --cc libril/Android.mk
index 3f1d3e8,65c77c7..696051e
--- 1/libril/Android.mk
--- 2/libril/Android.mk
+++ b/libril/Android.mk
@@@ -26,8 -21,8 +26,10 @@@ ifeq ($(SIM_COUNT), 2
      LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
  endif
  
 -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils
 +LOCAL_C_INCLUDES += external/nanopb-c
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
++LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
  
  LOCAL_MODULE:= libril
  

diff --cc librilutils/Android.mk
index 1ac00e0,d6da30c..455f9bc
--- 1/librilutils/Android.mk
--- 2/librilutils/Android.mk
+++ b/librilutils/Android.mk
@@@ -5,15 -5,13 +5,17 @@@ include $(CLEAR_VARS
  
  LOCAL_SRC_FILES:= \
      librilutils.c \
 -    record_stream.c
 +    record_stream.c \
 +    proto/sap-api.proto \
  
- LOCAL_C_INCLUDES += external/nanopb-c/ \
+ LOCAL_C_INCLUDES += \
++    external/nanopb-c/ \
+     $(LOCAL_PATH)/../include
+ LOCAL_EXPORT_C_INCLUDE_DIRS := \
+     $(LOCAL_PATH)/../include
  
- LOCAL_CFLAGS :=
- 
 +LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 +
  LOCAL_MODULE:= librilutils
  
  include $(BUILD_SHARED_LIBRARY)
@@@ -25,15 -23,13 +27,17 @@@ include $(CLEAR_VARS
  
  LOCAL_SRC_FILES:= \
      librilutils.c \
 -    record_stream.c
 +    record_stream.c \
 +    proto/sap-api.proto \
  
- LOCAL_C_INCLUDES += external/nanopb-c/ \
+ LOCAL_C_INCLUDES += \
++    external/nanopb-c/ \
+     $(LOCAL_PATH)/../include
+ LOCAL_EXPORT_C_INCLUDE_DIRS := \
+     $(LOCAL_PATH)/../include
  
- LOCAL_CFLAGS :=
- 
 +LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 +
  LOCAL_MODULE:= librilutils_static
  
  include $(BUILD_STATIC_LIBRARY)