am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo

Merge commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp

* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
  Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.