am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit 'ff382d0c40493303ceb81a6c22d1a48c0fecfe9c':
  DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"