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

Change-Id: I92595632d10dde1eb890895107e20c73ab80f162