am 133d4e92: Merge "Fix Os.link apicheck breakage."

* commit '133d4e9291bb62658c6f9bf37ce914578f9d50e7':
  Fix Os.link apicheck breakage.