Merge "Remove api_srcs property from java_sdk_library" am: bb7c5d4f69
am: 5a8ab0f617

Change-Id: I8e59a65466b1d401e1331bae39692ae815d21327