Merge "Use new java_system_features_srcs rule in framework" into main