Merge "Adding java_sdk_library"
am: dcbc89a3ab

Change-Id: I0709b0b66e8f30482d5cf7ecb64bf2765f677e60