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

Change-Id: I013b2a2fea09d76d2550ceb5a71288d6268101dd