fixed all code for building on all platforms inlcudng ANDROID