Added KeyboardHook to settings
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau (20) and others
# Via Mike McDonald (6) and others
* 'master' of git://github.com/awakecoding/FreeRDP: (26 commits)
  libfreerdp-codec: fix C++ headers
  libfreerdp-codec: fix ClearCodec short vbar cache hit
  libfreerdp-codec: improve ClearCodec error checking
  libfreerdp-codec: fix ClearCodec RLEX decoding
  libfreerdp-codec: ClearCodec fix error codes and wrapping around of cursors
  libfreerdp-codec: fix some ClearCodec flag checking
  Fixed issue with last merge.
  Added #ifdef WITH_OPENH264 ... #endif to appropriate places in the code.
  libfreerdp-codec: handle long vbar length mismatch
  channels/rdpgfx: add egfx command line options and settings
  libfreerdp-codec: reduce number of variables
  libfreerdp-codec: improve ClearCodec robustness
  libfreerdp-codec: simplify ClearCodec code
  Initial implementation of H.264 decoder for MS-RDPEGFX
  libfreerdp-codec: improve ClearCodec subcodec xStart, yStart handling
  libfreerdp-codec: improve ClearCodec subcodec support
  libfreerdp-codec: improve ClearCodec error checking
  libfreerdp-codec: more ClearCodec vBar caching
  channels/rdpgfx: harden parsing code
  libfreerdp-codec: add ClearCodec glyph cache
  ...
libfreerdp-codec: add more gfx H264 debug output
channels/rdpgfx: parse H264 bitmap stream and meta block
Added SetOption calls to enable trace logging in OpenH264.
xfreerdp: start using regionRects in egfx h264 decoding
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
libfreerdp-codec: add more egfx h264 debugging
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Added use of U/V planes to freerdp_image_copy_yuv420p_to_xrgb function.
Fixed wrong visibility setting of bookmark list view
Removed unused code.
* Fixed android setup script, if run as update. (git fetch instead of git pull)
* Checking return of openssl build now and inform about build errors.
cmake: android toolchain update to latest upstream

AndroidToolchain.cmake: updated from https://github.com/taka-no-me/android-cmake/raw/master/android.toolchain.cmake
cmake: android toolchain set ANDROID_DEFAULT_NDK_API_LEVEL 9
android CMakeLists.txt: added support for both 'support' and 'compatibility' in support library path for v7 appcompat

supports path styles:
$ANDROID_SDK/extras/android/support/v7/appcompat
$ANDROID_SDK/extras/android/compatibility/v7/appcompat
Merge pull request #1958 from akallabeth/android-bookmark-fix

Android bookmark fix
Merge pull request #1960 from akallabeth/android-build-script-fix

Android build setup script fixes
android toolchain: add back setting of ANDROID_SDK
server: allow partial channel read (fix rdpsnd).