[automerger skipped] Merge "Change the impl lib name of java_sdk_library" am: 1eb5db6cf0
am: 3603c8076b -s ours
am skip reason: change_id I5dd7f3a28bc22136b4e921de3eb5a3e77e5fc75f with SHA1 f4f4b8af4b is in history

Change-Id: I9fca36315f580068706e34734930d542a3ad5e6b