9ce445b8c7
Incorporated two header files directly into other since other parts were used (and it makes it hard to find the definitions). Removed TODOs that are less likely to be done. Reviewed By: yinying-lisa-li Differential Revision: https://reviews.llvm.org/D159381