Merge "fs_mgr: overlayfs: test: Add --print-time option" am: 3be9bff517
am: d36d052a20

Change-Id: Ia6f7bdcfe562d0119c6ace5c7f453fc927417cbf