Revert "Minimal changes to support multi-display HWC"

This reverts commit bddd724b178b1263c16e41b564165fcd0e93ff83

Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
8 files changed