Merge "Add deps to files used by backwards compatibility checker" am: bac7609c48 am: a8414e8326 am: 5b6b6170b8
am: 4b30a52b92

Change-Id: I45ee196ad7214c00744c5f45d6353ccbc88b700d