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

Change-Id: If1ef1fb8eaf3742b841f5ddd6f2fe3b5ba0782d0