Include more precise dependencies

Bug: 117921091
Test: all tests should pass
Change-Id: I3be0eeef413aaf69a3a9e27e0bc7f2841a1f5f95
2 files changed