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

Change-Id: I578d276269a9fe03ef1d54ce799a0f7648acadce