Merge "Mark libziparchive as VNDK in Android.bp" am: 4ed58aff38 am: cc52f1c947 am: b7f3fd13f5  -s ours
am: 7a4b99fdf4  -s ours

Change-Id: I023c011df757bdcdbef927e9c973ae06adbbcc17