refactor(@angular-devkit/build-ng-packagr): cleanup architect imports

Author: clydin

packages/angular_devkit/build_ng_packagr/src/build/index.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { catchError, mapTo, switchMap } from 'rxjs/operators';

packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts

@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { TestingArchitectHost } from '@angular-devkit/architect/testing/testing-architect-host';
+import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   experimental,
   join,