updating classes to android based changes

updating classes to android based changes