Merge "Minor edits to RvR test class." into oc-dev
am: d16790b20c

Change-Id: I7785258aa4e50598179c7b4f7366c3a3ef27d181
tree: 81a97cbb0c1a97314f5bf8660c477b93d7722d68
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg