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

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