Updated android build tools