cm3663: fix initial proximity sensor state

Change-Id: I544cf4065fd18bd9a54c855fdbbe3507c3ec3f75
makefile: mach-exynos: Separate 4x10 and 4x12 objects

Change-Id: If3270ba8e454d224d18202ff5e751fc61792b4d7
Merge branch 'cm-10.1' into martincz