Additional isolated declarations build fixes#32316

clydin wants to merge 2 commits intoangular:mainangular/angular-cli:mainfrom

clydin:isolated-declarations-6clydin/angular-cli:isolated-declarations-6Copy head branch name to clipboard