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

Change-Id: Ib10a65711cc1edaeb0ae3f2d4a2ee5da3f91ede4