change back dalvik options & add overlay for Settingsprovider