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