Merge "Move some directory creation out of installd."