omxplayer: [fix] subtitle priority for multiple external subtitles
Merge pull request #4251 from ThiasDE/extsub_priority

dvdplayer: [fix] subtitle priority for multiple external subtitles
[subsCore] close search window if playback is stopped
Merge pull request #4267 from amet/close_subs_window_on_stop

[subsCore] close search window if playback is stopped
Merge pull request #4258 from fritsch/aefixes

AESinkPULSE: Let Engine handle our volume
[osx/aesink] - fix compile on older SDKs
[DROID] Ease mount point blacklist condition

Android doesn't require USB devices be mounted under /mnt/usb.  In fact
there SEEMS to be no requirements or useful metrics for determining info
about mounted devices besides the "default external storage device"
which is always an SD card.  However, they do all SEEM to be handled by
Vold, the volume manager daemon and given a device node under
/dev/block/vold/.  It also SEEMS, from the four vendors I have on hand,
that SD card mount points alwasy contain the string "sdcard".  Using
these two rules get's me auto sources for USB devices on AML devices.
[DROID] Read /proc/mounts in one go to avoid race.

/proc/mounts is only guaranteed atomic for the current read operation.
[DROID] Only add one mount point per device

I've observed some prettys strange behavior on AML devices regarding
reading /proc/mounts.  Somehow there are multiple, unique mount points
for some devices when reading /proc/mounts with fopen/fgets.  However
they don't exist if "cat /proc/mounts" is issued from the shell.
Baffling...
Merge pull request #4070 from vkosh/epg-now

[epg] don't use epg tag that was active as a currently active one if epg contains gaps
Merge pull request #4236 from t-nelson/droid_removable_storage_fixes

Droid removable storage fixes
FIX: [gles] do not force vsync off if VSYNC_DRIVER
[ae/darwin] we don't need another mutex when we already have one
Better caching and updating for dynamic list provider
Cosmetic changes
[DROID][AE] Don't crash on passthrough.

The AudioTrack sink only ever wants S16LE.
URIUtils: add 'CanonicalizePath' function
WIN32Util::ConvertPathToWin32Form: update to resolve relative paths
WINSMBDirectory::GetDirectory: unify with other code and use WIN32Util::ConvertPathToWin32Form
Merge pull request #4279 from t-nelson/droid_passthrough_fix

[DROID][AE] Don't crash on passthrough.