Merge "Update linkerconfig configuration format"