overlay: disable fadimg marquee
prop: disable scissor optimization on 4470
add 128mb swap and remove discard mount
Merge remote-tracking branch 'kfire/cm-11.0' into cm-11.0

Conflicts:
	device.mk