Merge "Revert "simpleperf: add binaries in sdk build."" am: b4cdbd535c
am: 2f596464fd

Change-Id: I6969919508873bc4065849a70a9436329db603bb