Merge "Revert "bullhead: Enable MTP over functionfs"" into oc-mr1-dev
am: 7647637b7b

Change-Id: Idccbfb392c78c2478919d07bf97a728b81791d14