Merge "Search for runtime resource overlays in Java in subdir." into cw-f-dev
am: 58b783701c

Change-Id: I38e1035b8d84c2e7f1226301ac233015ed864aac