Merge "Use override_export_include_dirs."