Merge "Refactoring: Rewrite links in Metalava instead of carrying patches."