FIX: avoid waiting forever on a locked CPluginDirectory while exiting
Sort buttons depend directly on available sort methods
Python: Add a DelayedCallGuard to xbmc.executeJSONRPC.

Avoids locking other python threads running on the same process space as XBMC, since executeJSONRPC may trigger activity on them.
FIX: Do not remove internet files from video db only because they come from a disappeared source
FIX: [droid] Prevent droid from shutting us down when an usb/BT keyboard/gamepad is plugged in/out
[win32] remove "Debug" and "Release" as build solution as we always use "Debug (directX)" and "Release (DirectX)"
[cximage] Fix memleak in ximadsp.
[cximage] Fix uninitialized struct member in ximadsp.
[cximage] Fix common realloc mistake: 'm_pBuffer' nulled but not freed upon failure in xmemfile.
[cximage] Fix invalid number of character ({) when these macros are defined: 'PNG_NO_WRITE_FILTERING' in pngwutil.
[cximage] Fix possible "Buffer is accessed out of bounds: romm_cam" error in dcraw.
[cximage] Fix resource leak in dcraw.
[cximage] Fix possible "Buffer is accessed out of bounds: romm_cam" error in libdcr.
CHG: [stagefright] remove Rockchip blacklist (solved in latest firmwares)
Merge pull request #3332 from ace20022/cximage_fixes

[Fix] Some cximage fixes
Merge pull request #3258 from koying/fixdroidconfigevent

FIX: [droid] Prevent droid from shutting us down when an usb/BT keyboard./gamepad is plugged in/out
Merge pull request #3202 from mazkolain/python-jsonrpcfix

Avoid locking other Python threads when calling xbmc.executeJSONRPC

Fixes a bug. Can't hurt anything so it's going in.
Merge pull request #3334 from koying/CHGstfrockchip

CHG: [stagefright] remove Rockchip blacklist (solved in latest firmwares)
Merge pull request #3124 from koying/fixplugingetdirlock

FIX: avoid waiting forever on a locked CPluginDirectory while exiting
gles, fixed, add missing functions