Merge "Search for runtime resource overlays in subdir." into cw-f-dev am: 8bb793394d
am: b19ee72760

Change-Id: I42d83fe40c455a720a2bcc409f7d0805b18f6b6c