Fixes #3157 : Add Android OS Type support
Merge pull request #65 from VinceMacBuche/ust_3155/dev_3157/Android_backport

Fixes #3155 : Add Android OS Type display