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

* commit '97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
  Strip all multidex files, not just classes.dex