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

Change-Id: I87d78a7f822278a164b696c5722a270cc8c70272