Place dependencies on files rather than directories

Change-Id: I8bc3e13dde75bd3fcce4c0e326adcf9ff507af5a