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