Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder. (cherry picked from commit 432ac521ef)
432ac521ef