bump(build-94): Now with fewer circular deps.

Change-Id: I42a06adb69a15a40ee38601fae79c8eb1841843f