am 30807a45: am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

Merge commit '30807a4500fab8b46ee661db2ba99286049a8adc'

* commit '30807a4500fab8b46ee661db2ba99286049a8adc':
  Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.