Merge \"linker: Enable debug logging via properties\"

am: c8d5d2a524

Change-Id: Ia24feca7951934046f7255fbcc88f7a4cbe0c6e8

diff --cc linker/Android.mk
index e8b2ab4,0faf70b..f5bc821
--- 1/linker/Android.mk
--- 2/linker/Android.mk
+++ b/linker/Android.mk
@@@ -22,9 -22,9 +22,10 @@@ LOCAL_SRC_FILES := 
      dlfcn.cpp \
      linker.cpp \
      linker_block_allocator.cpp \
 +    linker_dlwarning.cpp \
      linker_gdb_support.cpp \
      linker_libc_support.c \
+     linker_logger.cpp \
      linker_mapped_file_fragment.cpp \
      linker_phdr.cpp \
      linker_sdk_versions.cpp \

diff --cc linker/dlfcn.cpp
Simple merge

diff --cc linker/linker.cpp
Simple merge