Merge "Add dependencies on classes.jar for soong modules" am: 8bef6515da
am: 00550036f8

Change-Id: I2d55062e6fa9c7fb24b9b44c37de726af3112e31