Revert "build: Put lockdir and cachedir in FHS-like locations by default"