Merge "Skip system/bin/bootstrap/linkerconfig"