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

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