Merge "Expand visibility of libcore-platform-compat-config"