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

Change-Id: Idf1ec8982316d3cef253609c702435a21d8f2eed