srhines added a comment. https://android-review.googlesource.com/#/c/328784/ may fix the problem with the top-level path. I think that more is still needed there too, but I just wanted to make you aware (so that perhaps the build patch hack can go away). https://reviews.llvm.org/D29050