Fix the path in config.sub.patch.
Merge branch 'master' into ca2013