Merge "Refresh mclinker local patches for last 2.7 rebase"