Merge "/vendor is sometimes on a separate partition now."