Merge "Mark libziparchive as VNDK in Android.bp"
am: 4ed58aff38

Change-Id: I3a672f2c51564d82fbde804850b9ec4d50a8f764