Remove references to non-existent directories am: 51ecf6889a
am: 9fe1c3db66

Change-Id: I94a662234b2850a93871673c6d3b6b19b63c2ca9