Remove references to non-existent directories am: 46d86758 -s ours am: 5be86306 -s ours am: b2694260 -s ours am: d7530815 -s ours Change-Id: I3d4f847eb7b72a7345cc327a3bd9d9762a89b6d8