Merge "Change the impl lib name of java_sdk_library" into pi-dev-plus-aosp