am 6d884d6c: Merge "Fix RS samples to prepare for 64-bit compilation."

* commit '6d884d6cb304e14e380ba501abe868cfaea97426':
  Fix RS samples to prepare for 64-bit compilation.