[automerger skipped] java_sdk_library: Improve consistency with ..._import am:...
[automerger skipped] java_sdk_library: Improve consistency with ..._import am: dce3fe78 -s ours am: 396d0db5 -s ours
am skip reason: Change-Id Ic5bf884b2b1e79841843e7c3b4642796ecd49f5d with SHA-1 0f8faffd is in history
Change-Id: If37ac60a2589a1da7b6e635623f6ae1e8afde1b0