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

Change-Id: I48b8b5bac4f4a577d8db0ba93a926f1864970920