Merge "replacing include_dirs with header_libs"