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

Change-Id: I80400e2b51b0b1f849cf72cb1fb6cfa83fec9ba6