ANDROID: update gki_defconfig

Update the default gki_defconfig now that there were some config changes
in mainline.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iafb8e2fa2d8027b2848e93d2d39b0ea42028289b