Merge "e2fsdroid: skip setting timestamp if src_dir is null"
am: 930bc06448

Change-Id: Ied1e99d9729711e5b27ee690c2fff68243050fa7