Convert another occurrence from chan bool to chan struct{}.

Change-Id: I11ba127a934ee3aec0fcd139ad32a7751cff77a0
Fix Makefile.

Change-Id: I061c0a70d082dc874e6481a75487ac93f986f770