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

Change-Id: If32060a8ed49a52d1dcb93d57ed7ce98052b9ff8