Merge "Track ObjC object mapping"

objc_sources := $(filter %.m,$(my_src_files))

objc_objects := $(addprefix $(intermediates)/,$(objc_sources:.m=.o))

$(call track-src-file-obj,$(objc_sources),$(objc_objects))

ifneq ($(strip $(objc_objects)),)

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) \

objcpp_sources := $(filter %.mm,$(my_src_files))

objcpp_objects := $(addprefix $(intermediates)/,$(objcpp_sources:.mm=.o))

$(call track-src-file-obj,$(objcpp_sources),$(objcpp_objects))

ifneq ($(strip $(objcpp_objects)),)

$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm $(yacc_cpps) $(proto_generated_headers) \