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

Change-Id: I939de1c7a71b23b49319668a803381c88ae6729e