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

Change-Id: Ic9f9cd0c35a78000f209dad0b6b8bba88c849d99