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