Merge "docs: fix a couple api links" into gingerbread