Merge "Fix Android build for mclinker."