Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread