Improve android building in other machines