Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev