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