Revert "Add robustness against vendor dependencies"

This reverts commit 783e26565ce5dbd0c56af1a2f3d54cdc41f13a40

Bug: 6815609
Change-Id: I2225a48133faccf7f08d80100306bbdc33a49eb2
1 file changed