Merge "Add new rs directory to list of Java subdirs of fw/base."