am d96a068c: am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76'

* commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.