This is a combination of 2 commits

-Update defconfig (disable fsync by default)
-Integrate s2w from Nexus 4