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

Change-Id: I39d95123c45da8104dc8f21f65ac9944ad682474