DeviceSettings: Fix build errors and remove SamsungServiceMode.apk