These should generally be INSTROOT_FOR_BUILD instead; also gengal only
had the URE's services.rdb (twice) but not the basis layer one.

Change-Id: If9cab809296fd66c1785562c5e5be6b2569d179c
(cherry picked from commit 4e6b4fba)