Merge "Revert^2 "Making NN hardware interface libs "host supported"""