Also remove unused dependencies flagged by unused_deps utility. Change-Id: I2ed7ede264313f85a19cf3e66c7cbb5bfacbb4ef