Update defconfig for recent merges

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>