Merge commit '2fc42a279697a847d5b6961914f6f6afbed49a48' from

oc-mr1-dev-plus-aosp into stage-aosp-master.

Change-Id: I754fe8c1ec11f047e58694a2fdc8d9ab1b85cab5

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

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

diff --cc libs/ui/Android.bp
index e47d2b8,cf79762..07aba32
--- 1/libs/ui/Android.bp
--- 2/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@@ -111,7 -111,10 +111,13 @@@ cc_library_shared 
      ],
  }
  
 -subdirs = ["tests"]
+ cc_library_headers {
+     name: "libui_headers",
+     export_include_dirs: ["include"],
+     vendor_available: true,
+ }
+ 
 +subdirs = [
 +    "tests",
 +    "tools",
 +]

diff --cc libs/vr/libbufferhub/Android.bp
Simple merge

diff --cc libs/vr/libbufferhubqueue/tests/Android.bp
Simple merge

diff --cc libs/vr/libdvr/Android.bp
Simple merge

diff --cc libs/vr/libvrsensor/include/dvr/pose_client.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge

diff --cc vulkan/nulldrv/null_driver.cpp
Simple merge