Merge "simpleperf: allow more than one pattern in test.py."
am: ab10d26e56

Change-Id: I982792f0fd7dea08e32b9825b3acb8c0ec07509b