am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"

* commit '701473cf9bb1d1da2a0f55d9732d3016e1f33d59':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem