Android support revised (SCL-6273) + tests fixed

Based on request #5 support of android-sdk-plugin. Related changes in intellij-scala will be pull requested a bit later.