Merge "simpleperf: fix importing tkinter in report.py." am: 1ad1e76f95
am: bd48c993ab

Change-Id: I74ae4869b536c0b7c2829639ccbbeef323cef726