Update multi_v7_defconfig for dropped and moved options
This series of two patches first updates multi_v7_defconfig for
dropped options, and then updates it for moved options. We want to
do this on regular basis to make it easier to patch multi_v7_defconfig
without introducing errors and merge conflicts. We update the defconfig
in two patches to make sure we're not accidentally losing any needed
options.
After this, updating multi_v7_defconfig will become trivial, and most
likely only a small follow-up patches are needed after the merge window
to update it again for moved options.