[automerger skipped] Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev am: 96d9fb7d -s ours am: 11ef6b20 -s ours
am skip reason: Change-Id Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 with SHA-1 c91f5d0c is in history
Change-Id: I5b4f6dfc4d359a196004f63b3fa9bcfbccec3474