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

Change-Id: I264cea720d43c0d371f3d3c3968992392f05a487