Merge "media: initialize dequeue counter in buffer info" am: 411c94ab97
am: 86f3ee848c

Change-Id: I6cab0d1f33fdcacfd29420f17a46763fd178a6d9