Merge "Mark sh_binary target as being bp2build_available."