Android.mk update
Fixes for Android and Linux compile errors
added danger
Merge remote-tracking branch 'origin/toni' into develop
jammed a lot