Merge "libasync_safe: stop clobbering other folks' identifiers."
am: f84d0a95bd

Change-Id: I17e708264382206d19dcee776905ccb4b9d1c903