Merge "Merge "Track libziparchive API change." am: 32581e1dd2 am: 78791cd8d7" into qt-dev-plus-aosp
am: 40358393fa

Change-Id: I02d8f5a7c8a4e255927e751591354415954c83a7