Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp * commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03': revert hwcomposer HAL changes. DO NOT MERGE.
Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp * commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03': revert hwcomposer HAL changes. DO NOT MERGE.