am 024a47e1: Merge "Update RS prebuilts and add x86 support." into jb-mr2-dev

* commit '024a47e17c21fb8f99b9889b5069d96db019738a':
  Update RS prebuilts and add x86 support.