am cc951f12: (-s ours) am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev

* commit 'cc951f128900f4691e4c55c6267f003e59aa229c':