Merge "configs: Use AOSP implementation for sw effects"