Merge "Improve compiler stats" am: 1583e62
am: c665f76

* commit 'c665f760f39d24be9101c448d884b46be41cf977':
  Improve compiler stats