Merge "Make uncompressing jni libs in prebuilt APKs reproducible" am: ae8e6c8cda
am: 0cfcb599ea

* commit '0cfcb599ea9047246767378b927413763960ef5e':
  Make uncompressing jni libs in prebuilt APKs reproducible