Merge "Make libasyncio headers usable from C" am: 5180d5b4dc
am: e661d52573

Change-Id: I31c4f488ffb7523c1b2980246be400d388ac0a25