Merge "Switch from deprecated include_dirs to local_include_dirs"