Merge "Fix tests: export_include_dirs."