am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"

* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
  Strip all multidex files, not just classes.dex