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

Change-Id: Ie1a804496974ebc44d41fee62531a219a2af4eb2