Delete obsolete subdirs specification. am: 67a7f6e45c
am: 32521f5fab

Change-Id: If6ce6d45154a8695fba51e3268ab9a91df21155b