Merge "Fix OsTest#test_xattr_Errno test on CTS"