Merge changes I002f4ab1,Ief34c1b5

* changes:
  Fix dependencies to be on core-libart, not core
  Do not require classes.dex to support stripped zip files