Merge "Remove references to non-existent directories"
am: 6e11707f06  -s ours

Change-Id: I21d5852ed4e92858f973b00565b443b0e23eb4e9