Refactor DeviceInfo for testing
Merge branch 'master' of github.com:amplitude/Amplitude-Android