am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS