Added some android related stuff