Merge "Move the resourcesdir option to the global options so that all doc builds put framework images in the right place."