Place dependencies on files rather than directories

Change-Id: Idced63032ad89e082290ca16dba45cb3048a2d63
Merge "Place dependencies on files rather than directories"