m4: Only enable MTP by default

Change-Id: I9eb9d5562ee5a861a8ae50395f82c957537862c4
Merge remote-tracking branch 'cm/cm-11.0' into HEAD