Merge "Allow linkerconfig to read apex-info-file.xml"