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

Change-Id: I75921fd256b694bb4d606c7aee2b3206d9a92d5c