Revise examples to use links->self

Change-Id: I387e841919f76937df6ea643f8618b67e5c2a199