Merge changes from topic "apr9" into rvc-dev

* changes:
  Include both 32 and 64-bit libraries in test APKs.
  Try adding native tests into "mts".