Merge "simpleperf: update building prebuilts."
am: d1df579357

Change-Id: Ic38640eccc732b298b94ab4f6b5a49a307f441bf