Merge "remove framework_base_subdirs"