Merge "jirix: Remove ManifestFile and ManifestDir."