Revert "serrano: Update defconfig"

This reverts commit b20eb2bf61f4dfe87fc31a22b589077be8a39da8.
mm: Undo Samsung's memory and swap changes

Change-Id: I630caee86b1998da1d7543e3f70b540319b4326f
Regenerate defconfigs

Change-Id: I8faef78c575aef62a5ad967fccf8e5fe2a5e2432
Merge branch into kk_mkt