Revert "hwc: Sync for rotator"

This reverts commit ce7b2febbcf02e4311db9b2a9613cf0136736d01.

Conflicts:
	libhwcomposer/hwc.cpp
	libhwcomposer/hwc_utils.cpp
	libhwcomposer/hwc_utils.h
fix merge errors