Merge "Add deps to files used by backwards compatibility checker" am: bac7609c48
am: a8414e8326

Change-Id: I7343c77fc1412b976bee659e8455e21a0e09606a