Merge "Fix mclinker for LLVM rebase to r275480" am: fa083b9e91
am: 6cc9287e9f

Change-Id: Ie4c7c98056a46f13436b5a7e860e408293763459