(#2154) - WIP - attempt 2 to get android working