Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e am: f9e16c98 am: 396487f5 am: 53303352 Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092