Merge "Change opaque RS typedefs from void * to int. These will likely become...

Merge "Change opaque RS typedefs from void * to int.  These will likely become int64_t once proper support for >32bits is worked out."