Surface holonomy for non-abelian 2-bundles via double groupoids