defconfig: merged the latest config changes.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>