am e69d4350: Merge "Support to add JNI of both archs in multilib build."

* commit 'e69d4350cd4af04349b703ba169ba516a96913ba':
  Support to add JNI of both archs in multilib build.