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