Fixes #3157 : Add Android OS Type support