Merge changes Ie9594b6e,I2e050a37,Ia2bf2ccf,I4e4db704,Ifbfd14e2, ... am: 0bc37ffbc6
am: b7209c26ca

* commit 'b7209c26ca3f28bd0f0f4772376914417f6fbb5b':
  Fix mac build
  Add ABI to leak report
  Combine leaks with same stacktrace
  Fix allocator::map template argument ordering
  Fold leaks that are referenced by other leaks
  Compile some tests for the host