Remove references to non-existent directories
am: 7f2b21a610

Change-Id: I8f06ee056ccc1087e785f8af73dc42e1021d8201