Merge "Add TEST_MAPPING for system/security/fsverity"