Snap for 9991246 from e2c5c7e18d5a2ff5ecc9895cd36539bff4652697 to udc-d1-release

Change-Id: I92b7eba7cd49a2ee2044f90e83397f54278fd6e5
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
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