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

Change-Id: I00e3f842d0306c1d40e341a7624a6cf05ef4fbd6