Merge "Put shared library R.jar files in the classpath" into main am:...

Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f am: a43251d7 am: e88d5b17 am: 0abb9e86

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024



Change-Id: I127c579d908b08cf5e868c8a8659061208a90bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>