am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread

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