Merge "mtp: Preserve last modified time of files."
am: c11caab96f

Change-Id: Ifa1988aa93a435b2603b61cda7eab34b2dce3127