Merge "Remove obsolete subdirs and optional_subdirs"