am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem"

* commit '3170358336dbe466cd3e9a5517e8e579b47cd084':
  DO NOT MERGE libstagefright: Stop using IGBC::BufferItem