Merge "Avoid symlink of simpleperf."
am: 908a3f30b5

Change-Id: Ibb740440e435f4174d5a846f788f5a52a4c844f8