Merge "simpleperf: update test apk to run on wear devices." into android11-tests-dev