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

Change-Id: If22df1399366cfec7d067e1c9c1811435aeb7e05