Hi all in 2.1.2 when you select "Android Mode" it opens up a brand new sketch (and leaves your current sketch in Java mode). I'm running OS X Mavericks.