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

* commit '470a2f85d26034771c82de18509f072596d53531':
  Fix up dependencies further for RS compatibility library.