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

Change-Id: Icfc4b332beb56efa1893630bf953808b93ad241a