[aml] sync xbmc version, fix silly audio crash from an assert
[aml] sync xbmc version, video_rate tweaks and back off pts error correction
Fix merge conflict