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

Change-Id: I19c1f34d47ed45de91fcfa0330f79c51ba5f9cb9