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

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