Merge "Fix failure of libvbmeta_test"