srhines added a comment. Aidan did ask me about upstreaming this particular (reworked) patch from our Android repository, so I did consent to submitting it. I can try to put together a test case for our particular differences. Repository: rL LLVM http://reviews.llvm.org/D14639