Cleaned up imports, Corrected VERSION.SDK_INT

also added JDK settings from windows import
Corrected VERSION.SDK_INT

this time for real