am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."

* commit '47f9b9bc290dae448f07101c1fb6629285973514':
  Add new rs directory to list of Java subdirs of fw/base.