Merge "Support for ID3 V2.4 tags." into froyo