Adding Android in the mix of supported platforms