Merge "Remove NN host specific build defines"