Revert "Reset compositionType to HWC_FRAMEBUFFER before calling prepare()"

This reverts commit ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc.

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.cpp