am 60b317df: am 3579f043: Merge "Clean up libziparchive Android.mk"

* commit '60b317dff8e8be306a74e2cf7322ecd164a0fa71':
  Clean up libziparchive Android.mk