Add more pertinent directories to the cleanspec after the APEX split. am: ee3ed38304 am: 3a3e17aec0
am: 23548fe7d4

Change-Id: I6e892f7eeaf0a72348248121be0a258ed62c8239