Switch to mtp as default rather than mass storage

Depends on http://gerrit.sudoservers.com/#/c/7738/
Otherwise the USB notification will not display.

Change-Id: Idc66d5c83a18e283545ca296c8870d5d1c71f1bb