am 0aa50b0d: am c08eceee: Merge "Add support for multiple architectures with...
am 0aa50b0d: am c08eceee: Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
* commit '0aa50b0d':
Add support for multiple architectures with RS compat lib.