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