Merge "stagefright: initial timed id3 support in hls"