Revert r196490 and fix include paths in makefile-based build

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@196492 91177308-0d34-0410-b5e6-96231b3b80d8