update for android S

Change-Id: I02763a134f592280652d4cd7eb2eea630d01ee14
diff --git a/src/AndroidDesktop.h b/src/AndroidDesktop.h
index 993f466..41a8543 100644
--- a/src/AndroidDesktop.h
+++ b/src/AndroidDesktop.h
@@ -10,8 +10,7 @@
 
 #include <gui/CpuConsumer.h>
 
-#include <ui/DisplayInfo.h>
-#include <ui/DisplayConfig.h>
+#include <ui/DisplayMode.h>
 #include <ui/DisplayState.h>
 
 #include <rfb/PixelBuffer.h>
@@ -80,8 +79,7 @@
     sp<VirtualDisplay> mVirtualDisplay;
 
     // Primary display
-    DisplayInfo mDisplayInfo;
-    DisplayConfig mDisplayConfig = {};
+    ui::DisplayMode mDisplayMode = {};
     ui::DisplayState mDisplayState = {};
 
     // Virtual input device