am 60751517: (-s ours) am d6bec833: am 80a4e249: Dalvik Zip rewrite.

Merge commit '60751517acb65abf5a4f5cede844d8932dea9542' into dalvik-dev

* commit '60751517acb65abf5a4f5cede844d8932dea9542':
  Dalvik Zip rewrite.