Allow building with unmodified CM device repos' overlays

Change-Id: Ic8f4b8ffa5374931c5d7f13e3f893869df1db187