Merge "Change perf-setup.sh to perf-setup in run.sh" am: 5d1eaf9c am:...

Merge "Change perf-setup.sh to perf-setup in run.sh" am: 5d1eaf9c am: 2af9f091 am: d9d95e4d am: 91c44f8c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461289

Change-Id: Id6636d1a6f78a5da4e9b5e52f988a8425d7ee9c0