am c42b6d1b: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'c42b6d1ba7273b51707b1312747edb2f81a6afe0':
  Updated prebuilts for RS support lib.