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

Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092