Merge "Refresh mclinker NDK local patches since 2.6 push"