Merge changes I0416b952,I53785040
* changes: Move libmtp to upstream libmtp-1-0-1 in preparation for fast forward. Fix build error.
Loading
* changes: Move libmtp to upstream libmtp-1-0-1 in preparation for fast forward. Fix build error.
mentioned in commit be6bd95d
mentioned in commit 6a43605f
mentioned in commit 4d2768c9
mentioned in commit 2b23816f