Merge "Don\'t crash if the perf map creation failed"
am: 5faf22c1d4

* commit '5faf22c1d4eb5d711f792b73d3e5773d67160c8f':
  Don't crash if the perf map creation failed