resolve merge conflicts of c6a78d31 to master

LOCAL_MODULE := dumpstate

LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase libhardware_legacy

LOCAL_SHARED_LIBRARIES := libcutils 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

#include <android-base/unique_fd.h>

#include <android-base/file.h>

#include <cutils/properties.h>

#include <hardware_legacy/power.h>

#include "private/android_filesystem_config.h"

#define TOMBSTONE_MAX_LEN (sizeof(TOMBSTONE_FILE_PREFIX) + 4)

#define NUM_TOMBSTONES  10

#define WLUTIL "/vendor/xbin/wlutil"

#define WAKE_LOCK_NAME "dumpstate_wakelock"

typedef struct {

  char name[TOMBSTONE_MAX_LEN];

    return std::string(hash_buffer);

}

static void wake_lock_releaser() {

    release_wake_lock(WAKE_LOCK_NAME);

}

int main(int argc, char *argv[]) {

    struct sigaction sigact;

    int do_add_date = 0;

    MYLOGI("begin\n");

    acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME);

    atexit(wake_lock_releaser);

    dry_run = property_get_bool("dumpstate.dry_run", 0) != 0;

    if (is_dry_run()) {

        MYLOGI("Running on dry-run mode (to disable it, call 'setprop dumpstate.dry_run false')\n");