Merge "Add deps to files used by backwards compatibility checker"