Revert "defconfig: Enable VMALLOC saving"

 * Not sure if this is causing the issues people are having
   lately, so revert it for now.

This reverts commit c226d72f608ed552a7709eaf4fc4050d18cddfb0.
display: samsung: Fixup after ML2 merge

 * These were overwritten in the merge

Change-Id: Ic68a24e3929de3f3d9200006476a2f256ce3eda7
Merge branch 'cm-11.0' into martincz