am abe5c079: am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread

* commit 'abe5c079440a0903085bc748c955d5b2b820a370':
  revert the surface purgatory list and dependent changes.