Merge "Correct paths in ValidateHalManifestTest."