am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS