am 10f31703: Fix up dependencies further for RS compatibility library.

* commit '10f317038dd53543dc8c7f5afe26a6360adfb5f3':
  Fix up dependencies further for RS compatibility library.