Merge "Revert "Update agents to support UI separation"" am: 0dec4e3c53 am: ad3c0ca12f am: 3e2ce8498b am: 45a12150da

Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2549534

Change-Id: If5efca126ded8cf784700fddd28595dd7e83d26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

host-common/include/host-common/vm_operations.h

diff --git a/host-common/include/host-common/vm_operations.h b/host-common/include/host-common/vm_operations.h
index 5dcd6c1..375d1bc 100644
--- a/host-common/include/host-common/vm_operations.h
+++ b/host-common/include/host-common/vm_operations.h
@@ -248,8 +248,5 @@
 
     // virtio display
     bool (*setDisplay)(int32_t id, int32_t w, int32_t h, uint32_t dpi);
-
-    // Reset the machine
-    void (*system_shutdown_request)(QemuShutdownCause reason);
 } QAndroidVmOperations;
 ANDROID_END_HEADER

host-common/include/host-common/window_agent.h

diff --git a/host-common/include/host-common/window_agent.h b/host-common/include/host-common/window_agent.h
index be16f13..a9489e0 100644
--- a/host-common/include/host-common/window_agent.h
+++ b/host-common/include/host-common/window_agent.h
@@ -36,9 +36,6 @@
 } WindowMessageType;
 
 typedef struct {} MultiDisplayPageChangeEvent;
-typedef struct SkinLayout SkinLayout;
-typedef struct QFrame QFrame;
-typedef struct SkinEvent SKinEvent;
 
 static const int kWindowMessageTimeoutInfinite = -1;
 
@@ -131,9 +128,6 @@
     void (*quit_request)(void);
     void (*getWindowPosition)(int*, int*);
     bool (*hasWindow)();
-
-    bool (*userSettingIsDontSaveSnapshot)(void);
-    void (*setUserSettingIsDontSaveSnapshot)(bool);
 } QAndroidEmulatorWindowAgent;
 
 #ifndef USING_ANDROID_BP