[aml] more temp AE fixes, this time from https://github.com/xbmc/xbmc/pull/2320