[automerger skipped] Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev am: 96d9fb7d am: 7c63ee24 am: 2b5b1585 -s ours
am skip reason: Change-Id Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 with SHA-1 00b206ee is in history
Change-Id: I684c33bd8522ba19e6d00f1000991474a8bc3816