am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev

* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':