Revert "ANDROID: gki_defconfig: Re-align defconfigs with saveconfig after latest merge"

This reverts commit 2cfc63c1.

On subsequent merges `saveconfig` decided that these weren't required
after all.

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I2c09069fc7ceba880723ce7e49eeb7b7411eb197