Merge branch 'master' into patch-1

android/service/platform_service.cpp

@@ -49,6 +49,7 @@ anbox::PlatformApiStub::WindowStateUpdate::Window PlatformService::unpack_window
     auto frame_bottom = data.readInt32();
     auto task_id = data.readInt32();
     auto stack_id = data.readInt32();
+    auto rotation_angle = data.readInt32();
 
     return anbox::PlatformApiStub::WindowStateUpdate::Window{
         -1, // Display id will be added by the caller

kernel/binder/binder.c

@@ -137,7 +137,11 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
 static int binder_stop_on_user_error;
 
 static int binder_set_stop_on_user_error(const char *val,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+					 const struct kernel_param *kp)
+#else
 					 struct kernel_param *kp)
+#endif
 {
 	int ret;
 

src/anbox/network/base_socket_messenger.cpp

@@ -138,7 +138,7 @@ unsigned short BaseSocketMessenger<stream_protocol>::local_port() const {
 
 template <typename stream_protocol>
 void BaseSocketMessenger<stream_protocol>::set_no_delay() {
-  const auto fd = socket->native();
+  const auto fd = socket->native_handle();
   int flag = 1;
   const auto ret =
       ::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,