Merge "liblog: use log/log.h when utilizing ALOG macros"

#include <string>

#include <vector>

#include <android/log.h>

#include <android-base/file.h>

#include <cutils/debugger.h>

#include <cutils/properties.h>

#include <cutils/sockets.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>