am 5861448a: am 205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev

* commit '5861448a2d85cbfdc814621095889978060dd0de':
  Don't build librs.*.so in bundled branches since we'll use native RS.