Android build fixes

fixes ndk compile issue introduced in commit # bbc310dec7fe66adf2ad16fe7e452e1b1a0daeb0
fixes #567