Revert "UAPI: Partition the header include path sets and add uapi/ header directories"

This reverts commit 2bb5a3af87c2cc7ba36c2256a885de02d9eda793.