am b7aaa0a0: Merge "Set librsjni 32-bit only"

* commit 'b7aaa0a0d96884ba5dce3da7c79ecc33f37fb045':
  Set librsjni 32-bit only