Merge "Parse test runner from the perf test apk by default"
am: 2e42e1fc35

Change-Id: I5afafd040d80b9861d664bf02c11516df3b09fd1