Merge "docs: fix broken links" into froyo