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

Change-Id: I6a4059685b8fd18ecc2b54d8ee3b0e4630e7f3a7