[aml] sync xbmc version, tvheadend fix
Merge remote-tracking branch 'upstream/master'