Merge "Mark libziparchive as VNDK in Android.bp"