Merge changes I514f1db3,I7dc1c7c0 am: 519281001d
am: 344c8ac9b9

* commit '344c8ac9b93dbd23d3470798393f076d6d3aa83c':
  Generate mini-debug-info on separate thread.
  Change the method which generates DWARF mini-debug-info.