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

Change-Id: Ic0d8d9171668430af2f127a35dbe0a3f00588954