am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'e3aa1c1f85f981fabe9be0587e49538f4b6dd576':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS