Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp * commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1': Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp * commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1': Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.