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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build