Merge "Merge "[automerger skipped] Merge "java_sdk_library: Simplify...

Merge "Merge "[automerger skipped] Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev am: 96d9fb7d -s ours am: 11ef6b20 -s ours" into rvc-d1-dev-plus-aosp am: 1ad7f274 -s ours" into rvc-qpr-dev-plus-aosp am: a75781cb -s ours

am skip reason: Change-Id Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 with SHA-1 00b206ee is in history

Change-Id: Ic4724ffd5638826b0fb764574a6e4b887a477b2e