Fix RS tests to prepare for 64-bit compilation.

Bug: 16031597
Change-Id: Id21b1ade6e097804f6c4f9caf765bf2f6ba8037e
(cherry picked from commit 9e8587a917a8783a817a32e54a63f311851dd6e4)
3 files changed