Revert "Revert "Here we come, 4.9""

This reverts commit cd93d5f71198242a336f678db02253145f91906b.
Merge remote-tracking branch 'JustArchi/cm-11.0' into cm-11.0-sgt7

Conflicts:
	core/combo/TARGET_linux-arm.mk