eugenis added a comment. I may have underestimated the number of places that will need to be patched because of this change. Perhaps we should restore the special case in the android library name? Repository: rL LLVM https://reviews.llvm.org/D26764