Merge "Fix validation of system paths in installd."