android guid support
Merge remote-tracking branch 'remotes/sachokFox-upstream/master' into dev