Merge "Revert "Sigh, more vendors linking against hidden APIs.""