Merge "Remove obsolete subdirs entry."
am: 100e8ffbcd

Change-Id: I3e11bcc22e77e9c1f36278721c7f8bb7e05d5a08