Remove local build fixes that were merged with ECH feature branch#1395

tweksteen merged 1 commit intogoogle:mastergoogle/conscrypt:masterfrom

mnbogner:ech_merge_cleanupmnbogner/conscrypt:ech_merge_cleanupCopy head branch name to clipboard