Revert "defconfig: remove duplicate options that are present in variant configs"

This reverts commit 590aaea351877a7194e50a8c6f8b4c0ecc2815d4.