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

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