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

Change-Id: Ia38f3a0f222499f6735aac97a8d300bd371f0187