sabermod defconfig

Update to match aosp's latest changes