Merge "Make mini-debug-info stripping pass on already stripped binaries" am: dd63df89d5
am: 4b69a9632e

Change-Id: Ie3bbf44ffc66069784ae8871cf09318d09c4d137