Merge "Revert "Use strip mode mini-debug-info by default.""
am: b34f69f

* commit 'b34f69f8499fe699edaca8715bed13b884cb9669':
  Revert "Use strip mode mini-debug-info by default."

Change-Id: Ie234fc5a11933a3364c34981f110f25f6f0842b8