Merge "Fix incorrect prebuilt-info.txt"