Merge "Clean up libziparchive Android.mk"