am 34c8d309: am a48decd4: Merge "Clean up libzipfile Android.mk"

* commit '34c8d309b0c8db56809841d37e90a0ae3029bcbc':
  Clean up libzipfile Android.mk