Merge "Remove references to non-existent directories" into oc-dev-plus-aosp am: d1d2a8205c
am: ae05bc7b27

Change-Id: I0cc8f52721d7e54ae1074cd880bdef26cd8fe276