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 '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp

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