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

Change-Id: I9468f653220bceec6d64f759eff4defe3940a663