Merge remote-tracking branch 'mptcp_3.4.x/mptcp_3.4.0' into android-4.2.1_r1
Enable MPTCP by default

Signed-off-by: Gregory Detal <gregory.detal@uclouvain.be>