Fixing Android compile errors.
Merge commit '8960d6d097f4ee392d89b9833630842751c85fff' into feature/mem-overhaul
Quick changes to android build to get it to compile.
Fixing Android build issues.
fixed conflics from feature/mem-overhaul