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

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

Change-Id: I2cbf9500c5271f67e59b4cfeb8a91b953d9db184