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

Change-Id: I584a599a1c6b2bca1f3eb7d8e35001f8ab8a9bc7