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