Merge "Switch core platform api to use java_sdk_library"