Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"