Merge "[vold] Check incremental paths before mounting"