Merge "Use strip mode mini-debug-info by default." am: c7eab6d
am: ab721f0

* commit 'ab721f0a5fc5dd88af409cd33566fd434c2b3235':
  Use strip mode mini-debug-info by default.

Change-Id: I5d82142dbcd188fd88ec68c6cfa926147d2d5339