am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'a04b43020e1289e8b7b2501471740ace944f18d5':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS