Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp * commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732': Fix a couple issues with the new hwcomposer HAL
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp * commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732': Fix a couple issues with the new hwcomposer HAL