Merge changes Iad853184,I92ac8d29

* changes:
  simpleperf: remove synthesized D8/R8 frames.
  simpleperf: Move ProguardMapping code into a separate class.