update android tools
minor cleanup