am b3478f4a: Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev

* commit 'b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea':
  Fix regression: log mem maps around native fault address