Merge "Fix handling of ID3v2.4 extended header" into rvc-dev am: d275acd4c4

Change-Id: I339ad8d9dcc20e5264b4ca6b27175f20e4b50c9c