Quick changes to android build to get it to compile.