am 8e13ce52: (-s ours) am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread

Merge commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c'

* commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c':
  revert hwcomposer HAL changes. DO NOT MERGE.