I'd suggest angel investing in startups that compliment your view on where things are headed. It's more fun than the stock market. You have proven knowledge of what's selling now, and understand software.

The turn around is probably longer than 2 years though.

Can you do the same thing with the Android store?