Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8
am: e3ac25eb0c

Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a