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

Change-Id: I4859ca06cbb6930a77d0d4e5f8bd6186116aa628