ActiveAE: fix shifting bits for AE_FMT_S24NE4
WASAPI: fix drain after new GetDelay
AE: clean out old GetDelay
AESinkPi: drop obsolete method GetCacheTime
Merge pull request #4943 from FernetMenta/aefixes

Aefixes
Merge branch 'master' of https://github.com/xbmc/xbmc
FFmpeg: Bump to 2.2-Helix-alpha2 - rebased on 2.2.3
AESinkIntelSMD: Add changes after new GetDelay

Thanks to quarnster and KeyserSoze1
libnfs: Build from libnfs master

with directory caching support
Revert "libnfs: Build from libnfs master"

This reverts commit b6e757a100e05ea6ecea80834c21fd0044fe397b.
libnfs: Build from libnfs master

Now working.
CMakeLists.txt: Remove duplicate expat build..

And a few other changes
Merge pull request #137 from quasar1/master

Sync master form test repo