am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE...
am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem"
* commit '8b0b1f77':
DO NOT MERGE libstagefright: Stop using IGBC::BufferItem