resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp

Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6

diff --cc include/gui/ISurfaceComposer.h
index 430a409,3ffc67e..f04a848
--- 1/include/gui/ISurfaceComposer.h
--- 2/include/gui/ISurfaceComposer.h
+++ b/include/gui/ISurfaceComposer.h
@@@ -38,7 -38,8 +38,8 @@@ namespace android 
  
  class ComposerState;
  class DisplayState;
 -class DisplayInfo;
 -class DisplayStatInfo;
 +struct DisplayInfo;
++struct DisplayStatInfo;
  class IDisplayEventConnection;
  class IMemoryHeap;
  class Rect;