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

Change-Id: I6d9c18a699f40fb4d3e6ba5fea8f770e15d9c3df