Fix C++ RS tests due to previous reflection/API changes.

Bug: 10427951
Change-Id: I06177d25cadf8697f9fca244edb2800e1102a7bf
6 files changed