Merge "Remove unnecessary dependency on libcore-platform-compat-config"