Merge "Remove obsolete subdirs and optional_subdirs" am: 2b5484564a

Change-Id: If5b2437f188c641456feea642d456b7af7013044