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

Change-Id: I29891f1fb080dde06d754a8a5a5e8a656f367bac