Merge "Disconnect deleted paths from build." into oc-support-26.0-dev am: b972321361
am: 1d0f2b3a49

Change-Id: I51510e7e3a5c3b38704e0e98a4704bbdbbcfb005