Revert^2 "Update agents to support UI separation"" am: f053c9850a am: 1bb16a2547 am: e4c530fc21 am: c1257c34e2

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

Change-Id: I62705d7ebd1bc518b39e7f7d56b3fe7936ec6daf
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 375d1bc..5dcd6c1 100644
--- a/host-common/include/host-common/vm_operations.h
+++ b/host-common/include/host-common/vm_operations.h
@@ -248,5 +248,8 @@
 
     // 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 a9489e0..be16f13 100644
--- a/host-common/include/host-common/window_agent.h
+++ b/host-common/include/host-common/window_agent.h
@@ -36,6 +36,9 @@
 } WindowMessageType;
 
 typedef struct {} MultiDisplayPageChangeEvent;
+typedef struct SkinLayout SkinLayout;
+typedef struct QFrame QFrame;
+typedef struct SkinEvent SKinEvent;
 
 static const int kWindowMessageTimeoutInfinite = -1;
 
@@ -128,6 +131,9 @@
     void (*quit_request)(void);
     void (*getWindowPosition)(int*, int*);
     bool (*hasWindow)();
+
+    bool (*userSettingIsDontSaveSnapshot)(void);
+    void (*setUserSettingIsDontSaveSnapshot)(bool);
 } QAndroidEmulatorWindowAgent;
 
 #ifndef USING_ANDROID_BP