Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c am: 32b3c649f5
am: 2a75fa607a

Change-Id: I7da31d2d9d1fcdabbf5ca3516b235a0237293948