Merge "simpleperf: omit samples get while dumping thread map information." am: 84ea73e65c
am: f600c50b67

Change-Id: Ic333f4f9912c3329a1e7bf5ffef59e069b73e1d4