Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am: 01efd2baca am: 01355680e6
am: d6276a4df1

Change-Id: I56808b55932fb5da0194c0ec4155b9a78c9e0f43