Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
am: 683f58096d

Change-Id: Iec1997b1671bacda94206deeff28a8c8c7048d36