Merge "Change perf-setup.sh to perf-setup in run.sh" am: 5d1eaf9cee am: 2af9f0911e

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

Change-Id: I0e9b1aa87b1d0f0fcc36c907bf1cb37ae3d9aff0