Merge "Add deps used by car-androidx-room-compiler"