Merge "mtp: fix double free of thumbnail data" into nyc-dev
am: 914bc14e82

Change-Id: I9f8e2264e93590de4179ee5c6ab30c7509e775f5