[automerger skipped] java_sdk_library: Control shared library use am:...
[automerger skipped] java_sdk_library: Control shared library use am: e6428b48 -s ours am: e1fdfe58 -s ours
am skip reason: Change-Id Iccf509e808d5ff53522188541a4c54d8f9ada93c with SHA-1 dfa131e6 is in history
Change-Id: I9ec814f46755687362236ec32ff57517ad64bc1e