Merge "Merge "Bp2Build for libs property in java_library" am: 4c592bc61f" into main-16k