resolve merge conflicts of ec7e2a164c37 to master

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5

diff --cc core/jni/android/graphics/pdf/PdfEditor.cpp
index b142925,59c5be6..c727519
--- 1/core/jni/android/graphics/pdf/PdfEditor.cpp
--- 2/core/jni/android/graphics/pdf/PdfEditor.cpp
+++ b/core/jni/android/graphics/pdf/PdfEditor.cpp
@@@ -20,11 -20,9 +20,11 @@@
  
  #include <vector>
  
- #include <android/log.h>
+ #include <log/log.h>
  #include <utils/Log.h>
  
 +#include "PdfUtils.h"
 +
  #include "jni.h"
  #include "JNIHelp.h"
  

diff --cc core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
Simple merge

diff --cc libs/hwui/Properties.cpp
Simple merge

diff --cc libs/hwui/renderthread/EglManager.cpp
index 02021fc,99bc9a7..7020be0
--- 1/libs/hwui/renderthread/EglManager.cpp
--- 2/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@@ -16,24 -16,18 +16,27 @@@
  
  #include "EglManager.h"
  
- #include "Texture.h"
+ #include <string>
+ 
+ #include "utils/StringUtils.h"
+ #include <cutils/properties.h>
+ #include <log/log.h>
+ 
  #include "Caches.h"
  #include "DeviceInfo.h"
 +#include "Frame.h"
  #include "Properties.h"
  #include "RenderThread.h"
  #include "renderstate/RenderState.h"
- #include "utils/StringUtils.h"
- #include <cutils/log.h>
- #include <cutils/properties.h>
++#include "Texture.h"
++
  #include <EGL/eglext.h>
- #include <string>
 +#include <GrContextOptions.h>
 +#include <gl/GrGLInterface.h>
 +
 +#ifdef HWUI_GLES_WRAP_ENABLED
 +#include "debug/GlesDriver.h"
 +#endif
  
  #define GLES_VERSION 2
  

diff --cc libs/hwui/tests/macrobench/TestSceneRunner.cpp
index f3b7b51,6533c2e..396e896
--- 1/libs/hwui/tests/macrobench/TestSceneRunner.cpp
--- 2/libs/hwui/tests/macrobench/TestSceneRunner.cpp
+++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
@@@ -22,9 -22,8 +22,9 @@@
  #include "renderthread/RenderProxy.h"
  #include "renderthread/RenderTask.h"
  
- #include <cutils/log.h>
 +#include <benchmark/benchmark.h>
  #include <gui/Surface.h>
+ #include <log/log.h>
  #include <ui/PixelFormat.h>
  
  using namespace android;

diff --cc services/core/jni/com_android_server_am_BatteryStatsService.cpp
index b22d5e7,531f946..ec36df1
--- 1/services/core/jni/com_android_server_am_BatteryStatsService.cpp
--- 2/services/core/jni/com_android_server_am_BatteryStatsService.cpp
+++ b/services/core/jni/com_android_server_am_BatteryStatsService.cpp
@@@ -17,37 -17,30 +17,37 @@@
  #define LOG_TAG "BatteryStatsService"
  //#define LOG_NDEBUG 0
  
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <inttypes.h>
+ #include <semaphore.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
 +#include <android/hardware/power/1.0/IPower.h>
  #include <android_runtime/AndroidRuntime.h>
  #include <jni.h>
  
  #include <ScopedLocalRef.h>
  #include <ScopedPrimitiveArray.h>
  
- #include <cutils/log.h>
+ #include <log/log.h>
  #include <utils/misc.h>
  #include <utils/Log.h>
 -#include <hardware/hardware.h>
 -#include <hardware/power.h>
  #include <suspend/autosuspend.h>
  
- #include <inttypes.h>
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <semaphore.h>
- #include <stddef.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
 +using android::hardware::Return;
 +using android::hardware::Void;
 +using android::hardware::power::V1_0::IPower;
 +using android::hardware::power::V1_0::PowerStatePlatformSleepState;
 +using android::hardware::power::V1_0::PowerStateVoter;
 +using android::hardware::power::V1_0::Status;
 +using android::hardware::hidl_vec;
 +
  namespace android
  {