This is no longer necessary with concat-deps rewriting the dependencies.

Change-Id: Ie27cf575346879a3cc89b8024c86fd2958d672c6