changing cmake to support android 21 (it'll break 14 i suppose)
Merge branch 'android_setup' of github.com:ustulation/MaidSafe into android_setup