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

Change-Id: Ia6d38f928d5a686acdb83a3965fdd21fbd0a4ec4