resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp

Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9

diff --cc cmds/dumpstate/Android.mk
index 0433f31,daeebc4..a352259
--- 1/cmds/dumpstate/Android.mk
--- 2/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@@ -10,7 -10,7 +10,7 @@@ LOCAL_SRC_FILES := dumpstate.cpp utils.
  
  LOCAL_MODULE := dumpstate
  
- LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase
 -LOCAL_SHARED_LIBRARIES := libcutils libdebuggerd_client liblog libselinux libbase libhardware_legacy
++LOCAL_SHARED_LIBRARIES := libcutils libdebuggerd_client liblog libselinux libbase
  # ZipArchive support, the order matters here to get all symbols.
  LOCAL_STATIC_LIBRARIES := libziparchive libz libcrypto_static
  LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

diff --cc cmds/dumpstate/utils.cpp
Simple merge