Remove references to non-existent directories
am: 51ecf6889a

Change-Id: I29b9c7fe56547d68bb3f305c30daef95333ecd65