am a2cdbdbf: am c6afba4a: Merge "MtpService: Recreate MtpStorage objects each time MTP starts" into jb-dev

* commit 'a2cdbdbf558a3b0e04f6b68bc333e18e6e891a64':
  MtpService: Recreate MtpStorage objects each time MTP starts