Remove references to non-existent directories am: 7f2b21a610
am: 1b71d10d4f

Change-Id: Id7007c472b1b5f992e14e0394de5374e777f155b