Update and rename uid to android uid