am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

Merge commit '374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp

* commit '374aee6888edddc5bcac9a644ad3de812404d3bc':
  Switch to use software MP3 decoder