fix some dependencies

Change-Id: I62d7715e120af6e9b9ff507eddbb5f72c54d86aa