am 0e76c6e0: am c5cb691c: Merge "Cleanup and improve stack map stream"

* commit '0e76c6e0aadd6efd2d0a57970e8c4c01d0264f33':
  Cleanup and improve stack map stream