Merge changes I06b8efa8,Id2fa2d18

* changes:
  Enable dexpreopt and dex stripping in soong jars
  Refactor removing classes.dex for dexpreopt