Merge "stagefright: update to QueueBufferInput interface"