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

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