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

Change-Id: I591a298ca14b7253249cfb2136ee2b350e1279f6