am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve...

am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '3e8b89bd' into kraken

* commit '3e8b89bd':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.