am 1f432b19: am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread

Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60'

* commit '1f432b19203b86a2b4da825943024c5b01eaeb60':
  Fix a couple issues with the new hwcomposer HAL