am 0b5a3fe0: Merge changes I002f4ab1,Ief34c1b5

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