Merge "Refactor enforcement of hidden API policy when linking"