Merge "Replace include_dirs with header_libs"