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

* commit '3be473bdb5297094bb48a10b8b388e1071ed999e':
  Strip all multidex files, not just classes.dex